Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager"
diff --git a/Android.bp b/Android.bp
index d21a430..e1c002d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@
 platform_compat_config {
     name: "settings-platform-compat-config",
     src: ":Settings-core",
+    system_ext_specific: true,
 }
 
 android_app {
@@ -62,7 +63,10 @@
     certificate: "platform",
     system_ext_specific: true,
     privileged: true,
-    required: ["privapp_whitelist_com.android.settings"],
+    required: [
+        "privapp_whitelist_com.android.settings",
+        "settings-platform-compat-config",
+    ],
     static_libs: ["Settings-core"],
     resource_dirs: [],
     optimize: {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4300e58..9bb810d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,6 +39,7 @@
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
@@ -2842,6 +2843,32 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="Settings$ManageExternalStorageActivity"
+            android:label="@string/manage_external_storage_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
+        <activity
+            android:name="Settings$AppManageExternalStorageActivity"
+            android:label="@string/manage_external_storage_title"
+            android:permission="android.permission.MANAGE_EXTERNAL_STORAGE">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.appinfo.ManageExternalStorageDetails" />
+        </activity>
+
         <!-- Keep compatibility with old WebView-picker implementation -->
         <activity-alias android:name=".WebViewImplementation"
                   android:targetActivity="Settings$WebViewAppPickerActivity"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..8061cb4
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "postsubmit": [
+    {
+      "name": "SettingsUnitTests",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index edf9a7c..7225df1 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -52,7 +52,7 @@
         android:visibility="gone" />
 
     <LinearLayout
-        android:theme="@style/Theme.MaterialComponents.DayNight"
+        android:theme="@style/Theme.TabTheme"
         android:id="@+id/tab_container"
         android:clipToPadding="true"
         android:clipChildren="true"
@@ -66,6 +66,7 @@
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layoutDirection="ltr"
             app:tabMaxWidth="0dp"
             app:tabGravity="fill"
             app:tabMode="fixed"
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index c995c3e..a3ad4207 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -341,25 +341,6 @@
                         style="@style/wifi_item_content"
                         android:text="@string/wifi_show_password" />
             </LinearLayout>
-
-            <LinearLayout android:id="@+id/sae_password_id_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item"
-                    android:visibility="gone">
-                <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_label"
-                        android:text="@string/wifi_sae_password_id" />
-
-                <EditText android:id="@+id/sae_password_id"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          style="@style/wifi_item_edit_content"
-                          android:singleLine="true"
-                          android:inputType="textNoSuggestions" />
-            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/wifi_advanced_toggle"
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
index 2146e28..14fe644 100644
--- a/res/layout/zen_mode_settings_button.xml
+++ b/res/layout/zen_mode_settings_button.xml
@@ -19,8 +19,24 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingVertical="@dimen/zen_mode_button_padding_vertical">
 
+    <TextView
+        android:text="@string/zen_mode_settings_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"/>
+
+    <TextView
+        android:text="@string/zen_mode_settings_summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:paddingTop="@dimen/zen_mode_button_padding_vertical"
+        android:paddingBottom="@dimen/zen_mode_button_padding_vertical"/>
+
     <Button
         android:id="@+id/zen_mode_settings_turn_on_button"
         style="@style/ActionPrimaryButton"
@@ -29,6 +45,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
+        android:gravity="center"
+        android:paddingTop="@dimen/zen_mode_button_padding_vertical"
         android:text="@string/zen_mode_button_turn_on"/>
 
     <Button
@@ -39,6 +57,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
+        android:gravity="center"
+        android:paddingTop="@dimen/zen_mode_button_padding_vertical"
         android:text="@string/zen_mode_button_turn_off" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1c9d44b..d1e0860 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privaatheid"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Gedeaktiveer deur administrateur"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nie beskikbaar nie"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sekuriteitstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skermslot, gesigslot"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skermslot, vingerafdruk"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Vereis bevestigingstap altyd as gesigslot in programme gebruik word"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Vee gesigdata uit"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Stel gesigslot op"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld en betalings te bevestig.\n\nHou in gedagte:\nAs jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word terwyl jou oë oop is.\n\nJou foon kan ontsluit word deur iemand wat baie soos jy lyk, byvoorbeeld \'n identiese broer of suster."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld en betalings te bevestig.\n\nHou in gedagte:\nAs jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nJou foon kan ontsluit word deur iemand wat baie soos jy lyk, byvoorbeeld \'n identiese broer of suster."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld en betalings te bevestig.\n\nHou in gedagte:\nAs jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word, selfs al is jou oë toe.\n\nJou foon kan ontsluit word deur iemand wat baie soos jy lyk, soos \'n identiese broer of suster."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vee gesigdata uit?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Die gesigdata wat deur gesigslot gebruik is, sal permanent en veilig uitgevee word. Nadat dit uitgevee is, sal jy jou PIN, patroon of wagwoord moet hê om jou foon te ontsluit, by programme aan te meld en betalings te bevestig."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteit"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonieme identiteit"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Wagwoord"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-wagwoordidentifiseerder"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Wys wagwoord"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Kies toegangspuntband"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Outo"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deel tans Wi‑Fi met hierdie toestel …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Koppel tans …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Deel warmkol"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifieer dat dit jy is"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifieer dat dit jy is"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aan/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Sal nooit outomaties afskakel nie"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sal outomaties afskakel met sonsopkoms"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Donker-tema gebruik ware swart om jou battery langer te laat hou. Donkertemaskedules wag totdat jou skerm af is om aan te skakel."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Donkertema gebruik op sommige skerms \'n swart agtergrond om te help om die battery langer te laat hou. Donkertemaskedules wag totdat jou skerm af is voordat hulle aanskakel."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skermuitteltyd"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Stel PIN vir vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Stel patroon vir sekuriteit"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Voer jou wagwoord weer in"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Voer jou werkwagwoord in"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bevestig jou patroon"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Voer jou werkpatroon in"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Voer jou PIN weer in"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Voer jou werk-PIN in"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Wagwoorde stem nie ooreen nie"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN\'e stem nie ooreen nie"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Teken weer jou patroon"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Skermleser hoofsaaklik vir mense wat blind of swaksiende is"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tik op items op jou skerm om te hoor hoe hulle hardop gelees word"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Onderskrifvoorkeure"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Vergroot"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingarea"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Wys verskuiwingbeheerder"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Wys \'n beheerder wat soos \'n stuurstang lyk waarmee jy die vergrotingarea kan rondskuif"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Vergrotinginstellings"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Vergroot met kortpad en trippeltik"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Meer oor Vergroot"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opsies"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoem in op skerm"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tik 3 keer om te zoem"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tik op \'n knoppie om te zoem"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Kies SIM-kaart"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranje"</string>
     <string name="color_purple" msgid="6603701972079904843">"Pers"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pienk"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Geen SIM-kaarte ingevoeg nie"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-status (SIM-gleuf %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 is geaktiveer</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Skakel Moenie steur nie aan"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Uitsonderings"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkeer visuele steurings"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Laat visuele tekens toe"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Wanneer Moenie Steur Nie aan is"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Laat onderbrekings wat klanke maak toe"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Beperk kennisgewings"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Geen klank van kennisgewings af nie"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Jy sal kennisgewings op jou skerm sien"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Demp toestel, maar laat uitsonderings toe"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Uitsonderings"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Skedule"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Sien alle uitsonderings"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Uitsonderings wanneer Moenie Steur Nie aan is"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Mense"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Programme"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Wekkers en ander onderbrekings"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Skedules"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Kennisgewings wat stilgemaak is"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Klank en vibrasie sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Demp almal behalwe"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Gedemp"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Gesprekke"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Laat boodskappe toe"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Kyk of jou toestel op lui, vibreer of stil gestel is om seker te wees dat toegelate boodskappe klank maak."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Geen"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Moet geen oproepe toelaat nie"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Moet geen boodskappe toelaat nie"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Laat wekkers toe"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Wekkers"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Van aftellers, wekkers, sekuriteitstelsels en ander programme af"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"wekkers"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Speel mediaklanke"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Mediaklanke"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Van video\'s, speletjies en ander media af"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Laat raakklanke toe"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Raakklanke"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Van jou sleutelbord- en ander knoppies af"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"raakklanke"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Laat onthounotas toe"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Onthounotas"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Van take en onthounotas af"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"onthounotas"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Laat geleenthede toe"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Geleenthede"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Van komende kalendergeleenthede af"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Laat programme toe om te ignoreer"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Programuitsonderings"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Wys bo-oor ander programme"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Laat toe dat dit bo-oor ander programme wys"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Laat hierdie program toe om te wys bo-oor ander programme wat jy gebruik. Dit kan met jou gebruik van daardie programme inmeng of die manier verander waarop hulle voorkom of optree."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Toegang tot alle lêers"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Laat toegang toe om alle lêers te bestuur"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Laat hierdie program toe om alle lêers op hierdie toestel of enige gekoppelde bergingvolumes te lees, te wysig en uit te vee. Indien toestemming verleen word, kan die program sonder jou uitdruklike medewete by lêers ingaan."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Kan by alle lêers ingaan"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuele realiteit luisteraar stereo helper diens"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Wys bo-oor ander programme"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> programme word toegelaat om oor ander te wys"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b2c47cd..531de1a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ግላዊነት"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"በአስተዳዳሪ ተሰናክሏል"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"አይገኝም"</string>
     <string name="security_status_title" msgid="6958004275337618656">"የደህንነት ሁኔታ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ማያ ገጽ መቆለፊያ፣ የፊት መክፈቻ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"የማያ ገጽ ቁልፍ፣ የጣት አሻራ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"በመተግበሪያዎች ውስጥ በመልክ መክፈቻን ስትጠቀም ሁልጊዜ የማረጋገጫ እርምጃን ጠይቅ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"የመልክ ውሂብ ይሰረዝ?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"በመልክ መክፈቻን ያቀናብሩ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"መሣሪያዎን ለመክፈት፣ በመለያ ወደ መተግበሪያዎች ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈቻን ይጠቀሙ።\n\nእነዚህን ከግምት ውስጥ ያስገቡ፦\nስልኩን ሲመለከቱት ሳያስቡት ሊከፍተው ይችላል።\n\nአይኖችዎ ክፍት ሆነው ሳለ የሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"መሣሪያዎን ለመክፈት፣ በመለያ ወደ መተግበሪያዎች ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈቻን ይጠቀሙ።\n\nእነዚህን ከግምት ውስጥ ያስገቡ፦\nስልኩን ሲመለከቱት ሳያስቡት ሊከፍተው ይችላል።\n\nየሆነ ሰው ስልክዎን ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"መሣሪያዎን ለመክፈት፣ በመለያ ወደ መተግበሪያዎች ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈቻን ይጠቀሙ።\n\nእነዚህን ከግምት ውስጥ ያስገቡ፦\nስልኩን ሲመለከቱት ሳያስቡት ሊከፍተው ይችላል።\n\nአይኖችዎ ዝግ ሆነውም እንኳ የሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"የፊት ውሂብ ይሰረዝ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"በፊት መክፈቻ ጥቅም ላይ የዋለው የፊት ውሂብ በቋሚነት እና ደህንነቱ በተጠበቀ መንገድ ይሰረዛል። ከተወገደ በኋላ የእርስዎን ስልክ ለመክፈት በመለያ ወደ መተግበሪያዎ ገብተው ክፍያዎችን ለማረጋገጥ የእርስዎን ፒን፣ ሥርዓተ ጥለት ወይም የይለፍ ቃል መጠቀም ይኖርብዎታል።"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"መታወቂያ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ስም አልባ መታወቂያ"</string>
     <string name="wifi_password" msgid="1458802324849513755">" የይለፍ ቃል፡"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE የይለፍ ቃል ለዪ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"የይለፍ ቃል አሳይ"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"የመዳረሻ ነጥብ ባንድ ይምረጡ"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ራስ-ሰር"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ከዚህ መሣሪያ ጋር Wi‑Fi በማጋራት ላይ…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"በመገናኘት ላይ…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"መገናኛ ነጥብን አጋራ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"እርስዎ መሆንዎን ያረጋግጡ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"እርስዎ መሆንዎን ያረጋግጡ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"በጭራሽ በራስ-ሰር አይጠፋም"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ፀሐይ ስትወጣ በራስ-ሰር ይጠፋል"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ጨለማ ገጽታ የባትሪዎን ዕድሜ ለማራዘም እንዲያግዝ እውነተኛ ጥቁር ቀለምን ይጠቀማል። ማያ ገጽዎ እስኪጠፋ ድረስ የጨለማ ገጽታ መርሐግብሮች ለመብራት ይጠብቃሉ።"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ጨለማ ገጽታ ላይ የባትሪ ዕድሜ እንዲራዘም ለማገዝ በአንዳንድ ማያ ገጾች ጥቁር ጀርባን ይጠቀማል። የጨለማ ገጽታ መርሐግብሮች ለመብራት ማያ ገጽዎ እስኪጠፋ ድረስ ይጠብቃሉ።"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ማያ ጊዜው እረፍት"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"ማያ ገጽ የሚጠፋው"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"የጣት አሻራን ለመጠቀም ፒን ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ለደህንነት ሲባል ሥርዓተ-ጥለትን ያቀናብሩ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"የእርስዎን ይለፍ ቃል ደግመው ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"የስራ ይለፍ ቃልዎን ያስገቡ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"የስራ ስርዓተ-ጥለትዎን ያስገቡ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"የእርስዎን ፒን ደግመው ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"የስራ ፒንዎን ያስገቡ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"የይለፍ ቃላት አይዛመዱም"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ያስገቡት ፒን አይዛመዱም"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"የእርስዎን ሥርዓተ-ጥለት እንደገና ይሣሉ"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"በዋነኝነት ማየት የተሳናቸው ወይም የማየት ችሎታቸው ዝቅተኛ ለሆኑ ሰዎች የሆነ የማያ ገጽ አንባቢ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"በማያ ገጽዎ ላይ ያሉ ንጥሎች ጮክ ተብለው ሲነበቡ ለማዳመጥ መታ ያድርጓቸው"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"የመግለጫ ጽሑፍ ምርጫዎች"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ማጉላት"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"አጉላ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"የማጉያ አካባቢ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"የአንቀሳቅስ መቆጣጠሪያን አሳይ"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"የማጉያ አካባቢውን ለማንቀሳቀስ እንደ መቆጣጠሪያ ጆይስቲክን አሳይ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"የማጉያ ቅንብሮች"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"በአቋራጭ እና ሦስቴ መታ በማድረግ ያጉሉ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"ስለ ማጉላት"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"አማራጮች"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"በማያ ገጹ ላይ ያጉሉ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ለማጉላት 3 ጊዜ መታ ያድርጉ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ለማጉላት አንድ አዝራር መታ ያድርጉ"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM ካርድ ይምረጡ"</string>
     <string name="color_orange" msgid="216547825489739010">"ብርቱካናማ"</string>
     <string name="color_purple" msgid="6603701972079904843">"ወይን ጠጅ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ሮዝ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ምንም ሲም ካርዶች አልገቡም"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"የSIM ሁኔታ"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"የሲም ሁኔታ (የሲም ማስገቢያ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ነቅቷል</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"አትረብሽን አብራ"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"የማይካተቱት"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>፦ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ምስላዊ ረብሻዎችን አግድ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ምስላዊ ምልክቶችን ፍቀድ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"አትረብሽ ሲበራ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ድምፅ የሚፈጥሩ ረብሻዎችን ፍጠር"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ማሳወቂያዎችን ገድብ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ከማሳወቂያዎች ምንም ድምጽ የለም"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ማሳወቂያዎችን በማያዎ ላይ ይመለከታሉ"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"መሣሪያን ድምፀከል አድርግ ግን ልዩ ሁኔታዎች ፍቀድ"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"የማይካተቱት"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"መርሐግብር"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ሁሉንም የማይካተቱትን ይመልከቱ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"አትረብሽ ሲበራ በልዩ ሁኔታ የሚታዩ"</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_schedule" msgid="2003707171924226212">"መርሐግብሮች"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ጸጥ እንዲሉ የተደረጉ ማሳወቂያዎች"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር ድምጽ እና ንዝረት ድምጸ-ከል ይደረግባቸዋል።"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ከእነዚህ በስተቀር ሁሉንም ድምጸ-ከል አድርግባቸው"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ድምጸ-ከል ተደርጓል"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"ውይይቶች"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"መልዕክቶችን ፍቀድ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"የተፈቀደላቸው መልዕክቶች ድምጽ እንደሚፈጥሩ እርግጠኛ ለመሆን መሣሪያዎ ወደ መደወል፣ ንዝረት ወይም ጸጥ ያለ ተቀናብሮ እንደሆነ ይመልከቱ።"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ለ«<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» ገቢ መልዕክቶች ይታገዳሉ። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ምንም"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ማናቸውንም ጥሪዎች አይፍቀዱ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ምንም አስተያየቶች አይፍቀዱ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"ማንቂያዎችን ፍቀድ"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ማንቂያዎች"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ከጊዜ ቆጣሪዎች፣ ማንቂያዎች፣ የደህንነት ሥርዓቶች፣ እና ሌሎች መተግበሪያዎች"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ማንቂያዎች"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"የሚዲያ ድምጾችን አጫውት"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"የማህደረ መረጃ ድምፆች"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ከቪዲዮዎች፣ ጨዋታዎች እና ሌሎች ማህደረ መረጃዎች"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ሚዲያ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"የንክኪ ድምጾችን ፍቀድ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ድምፆችን ይንኩ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ከቁልፍ ሰሌዳ እና ሌሎች አዝራሮች"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ድምፆችን ይንኩ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"አስታዋሾችን ፍቀድ"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"አስታወሾች"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ከተግባራት እና አስታዋሾች"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"አስታዋሾች"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ክስተቶችን ፍቀድ"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ክስተቶች"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ከመጻኢ የቀን መቁጠሪያ ክስተቶች"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"መተግበሪያዎች እንዲሽሩ ይፍቀዱ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"የመተግበሪያ ልዩ ሁኔታዎች"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"በሌሎች መተግበሪያዎች ላይ አሳይ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"በሌሎች መተግበሪያዎች ላይ ማሳየትን ፍቀድ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ይህ መተግበሪያ እየተጠቀሙ ባሉ ሌሎች መተግበሪያዎች ላይ እንዲያሳይ ይፍቀዱለት። በእነዚያ መተግበሪያዎች አጠቃቀምዎ ላይ ጣልቃ ሊገባ፣ ወይም መልካቸውን ወይም ባህሪያቸው ሊቀይር ይችላል።"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"የሁሉም ፋይሎች መዳረሻ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ሁሉንም ፋይሎች ለማስተዳደር መዳረሻ ፍቀድ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ይህ መተግበሪያ በዚህ መሣሪያ ላይ ወይም በማናቸውም የተገናኙ የማከማቻ መጠኖች ላይ ሁሉንም ፋይሎች እንዲያነብ፣ እንዲያሻሽል እና እንዲሰርዝ ይፍቀዱ። ፈቃድ ከተሰጠ፣ መተግበሪያ ያለ የእርስዎ ግልጽ የሆነ ዕውቀት ፋይሎችን መድረስ ይችላል።"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ሁሉንም ፋይሎች መድረስ ይችላል"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"ምናባዊ ዕውነታ አዳማጭ ስቲሪዮ አጋዥ አገልግሎት"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"በሌሎች መተግበሪያዎች ላይ አሳይ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> ከ<xliff:g id="COUNT_1">%2$d</xliff:g> መተግበሪያዎች በሌሎች መተግበሪያዎች ላይ እንዲያሳዩ ተፈቅዶላቸዋል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c5d1d7e..db3d767 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -322,10 +322,10 @@
     <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"الجهاز ليس مشفرًا."</string>
     <string name="lockscreen_settings_title" msgid="5324197107343656770">"عرض شاشة التأمين"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ما يتم عرضه"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"‏تعيين موقعي، فتح قفل الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تعيين موقعي، فتح قفل الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"الخصوصية"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"تم إيقاف الإعداد بواسطة المشرف"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"غير متاح"</string>
     <string name="security_status_title" msgid="6958004275337618656">"حالة الأمان"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل الشاشة، فتح القفل بالوجه"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل الشاشة، بصمة الإصبع"</string>
@@ -347,7 +347,7 @@
     <string name="security_settings_face_enroll_introduction_no_thanks" msgid="1820618982738898717">"لا، شكرًا"</string>
     <string name="security_settings_face_enroll_introduction_agree" msgid="1822303197642630076">"موافق"</string>
     <string name="security_settings_face_enroll_introduction_more" msgid="1970820298889710532">"المزيد"</string>
-    <string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"إلغاء القفل باستخدام وجهك"</string>
+    <string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"فتح القفل باستخدام وجهك"</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"استخدام وجهك للمصادقة"</string>
     <string name="security_settings_face_enroll_introduction_message" msgid="3015751486939484934">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="5841976283789481311">"يمكنك استخدام وجهك لفتح الهاتف أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام وجهك لفتح هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
@@ -383,7 +383,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"عند استخدام ميزة \"فتح القفل بالوجه\" في التطبيقات، اطلُب دائمًا خطوة التأكيد."</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"حذف بيانات الوجه"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"إعداد ميزة \"فتح القفل بالوجه\""</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"يمكنك استخدام \"فتح القفل بالوجه\" لفتح قفل الجهاز وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع.\n\nملاحظة مهمة:\nقد تفتح الهاتف بدون قصد بمجرّد النظر إليه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك وأنت فاتح عينيك.\n\nوكذلك، يمكن لشخص يشبهك كثيرًا، مثل شقيقك التوأم، فتح قفل الهاتف."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"يمكنك استخدام ميزة \"فتح القفل بالوجه\" لفتح قفل الهاتف وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع.\n\nملاحظة مهمة:\nقد تفتح الهاتف بدون قصد بمجرّد النظر إليه.\n\nيمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك.\n\nقد يتمكّن شخص يشبهك كثيرًا، مثلاً شقيقك التوأم، من فتح قفل الهاتف."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"يمكنك استخدام \"فتح القفل بالوجه\" لفتح قفل الجهاز وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع.\n\nملاحظة مهمة:\nقد تفتح الهاتف بدون قصد بمجرّد النظر إليه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك، حتى وأنت مغلق عينيك.\n\nوكذلك، يمكن لشخص يشبهك كثيرًا، مثل شقيقك التوأم، فتح قفل الهاتف."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"هل تريد حذف بيانات الوجه؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"سيتم حذف بيانات الوجه التي تستخدمها ميزة \"فتح القفل بالوجه\" نهائيًا وبشكلٍ آمن. وبعد إزالتها، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف وتسجيل الدخول إلى التطبيقات وتأكيد الدفعات."</string>
@@ -457,7 +457,7 @@
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"تعذّر تسجيل بصمة الإصبع. يُرجى إعادة المحاولة أو استخدام إصبع آخر."</string>
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"إضافة بصمة إصبع أخرى"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"التالي"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"بالإضافة إلى إلغاء قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"بالإضافة إلى فتح قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" تم إيقاف خيار قفل الشاشة. لمعرفة المزيد من المعلومات، اتصل بمشرف مؤسستك. "<annotation id="admin_details">"مزيد من التفاصيل"</annotation>\n\n"ما زال بإمكانك استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيقات. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات الإصبع"</string>
@@ -473,8 +473,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"تشفير الهاتف"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب إلغاء قفل الشاشة لفك تشفير الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية التشفير. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب إلغاء قفل الشاشة لفك تشفير الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية التشفير. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب فتح قفل الشاشة لفك تشفير الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية التشفير. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب فتح قفل الشاشة لفك تشفير الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية التشفير. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"تشفير الهاتف"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"اشحن البطارية وأعد المحاولة."</string>
@@ -497,8 +497,8 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‏تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‏تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"لم ينجح إلغاء التشفير"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام جهازك اللوحي، يلزمك إجراء إعادة تعيين إعدادات المصنع. عند إعداد الجهاز اللوحي بعد إعادة التعيين، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام هاتفك، يلزمك إجراء إعادة تعيين إعدادات المصنع. عند إعداد الهاتف بعد إعادة التعيين، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام جهازك اللوحي، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام هاتفك، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"تبديل أسلوب الإدخال"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"تأمين هاتفك"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"تعيين قفل شاشة لحماية الجهاز اللوحي"</string>
@@ -544,12 +544,12 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"بصمة الإصبع ورقم التعريف الشخصي"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"بصمة الإصبع وكلمة المرور"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"المتابعة بدون بصمة الإصبع"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"يمكنك إلغاء قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"يمكنك فتح قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="5991691559532427891">"\"فتح القفل بالوجه\" مع النقش"</string>
     <string name="face_unlock_set_unlock_pin" msgid="8990569318587034610">"\"فتح القفل بالوجه\" مع رقم التعريف الشخصي"</string>
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"\"فتح القفل بالوجه\" مع كلمة المرور"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"المتابعة بدون إعداد \"فتح القفل بالوجه\""</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"يمكنك إلغاء قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="face_unlock_title" msgid="7344830351598247267">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"تم إيقافه بواسطة المشرف، أو سياسة التشفير، أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"بدون قفل"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"التمرير السريع"</string>
@@ -563,35 +563,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="669384600341275312">"لن تعمل ميزات حماية الجهاز بدون النقش."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8160948976853039106">"لن تعمل ميزات حماية الجهاز بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="3732073290049930632">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="2018020861756931097">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="2130004168084396797">"لن تعمل ميزات حماية الجهاز بدون كلمة المرور."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="8455564842615579472">"لن تعمل ميزات حماية الجهاز بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="8903568674104115231">"لن تعمل ميزات حماية الجهاز بدون قفل الشاشة."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="4985095359625056279">"لن تعمل ميزات حماية الجهاز بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="6850770024037691891">"لن تعمل ميزات حماية الملف الشخصي بدون النقش."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="313998125412427527">"لن تعمل ميزات حماية الملف الشخصي بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="6328378875803145738">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="6844729803535310058">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="6922335143823758149">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="5724824564583660260">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم ازالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم ازالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6886183964362015704">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="3754195701700959477">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="621607297961726537">"نعم، إزالة"</string>
     <string name="unlock_change_lock_pattern_title" msgid="8234523589333929193">"تغيير نقش فتح القفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="2324077520816477479">"‏تغيير رمز PIN لإلغاء التأمين"</string>
@@ -945,7 +945,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"الهوية"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"هوية مجهولة"</string>
     <string name="wifi_password" msgid="1458802324849513755">"كلمة المرور"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"‏معرّف كلمة مرور SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"إظهار كلمة المرور"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"‏تحديد نطاق AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"تلقائي"</string>
@@ -986,9 +985,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"‏جارٍ مشاركة Wi‑Fi مع هذا الجهاز…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"جارٍ الاتصال…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"مشاركة نقطة الاتصال"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"التحقق من هويتك"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"إثبات هويتك"</string>
     <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" 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>
@@ -1269,7 +1270,7 @@
     <string name="night_display_title" msgid="8532432776487216581">"الإضاءة الليلية"</string>
     <string name="night_display_text" msgid="4789324042428095383">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف، ما يسهّل النظر إلى الشاشة في الإضاءة الخافتة ويمكن أن يساعدك على الشعور بالنعاس أيضًا."</string>
     <string name="night_display_auto_mode_title" msgid="5869128421470824381">"تحديد جدول زمني"</string>
-    <string name="night_display_auto_mode_never" msgid="2721729920187175239">"عدم التشغيل أو الإيقاف مطلقًا"</string>
+    <string name="night_display_auto_mode_never" msgid="2721729920187175239">"عدم تحديد جدول زمني"</string>
     <string name="night_display_auto_mode_custom" msgid="3938791496034086916">"التفعيل في وقت مخصّّص"</string>
     <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"التفعيل من غروب الشمس حتى شروقها"</string>
     <string name="night_display_start_time_title" msgid="2611541851596977786">"وقت البدء"</string>
@@ -1306,7 +1307,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"مفعَّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"لن يتم مطلقًا إيقاف الوضع تلقائيًا."</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"سيتم إيقاف الوضع تلقائيًا عند شروق الشمس"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"يستخدم \"المظهر الداكن\" اللون الأسود الداكن لتوفير طاقة البطارية والحفاظ عليها لفترة أطول. لا يتم تفعيل الجداول الزمنية لعمل \"المظهر الداكن\" إلا بعد قفل الشاشة."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"يستخدم \"التصميم الداكن\" خلفية سوداء لتوفير طاقة البطارية والحفاظ عليها لفترة أطول في بعض الشاشات. لا يتم تفعيل الجداول الزمنية لعمل \"التصميم الداكن\" إلا بعد قفل الشاشة."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"مهلة غلق الشاشة"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"إيقاف الشاشة"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1354,7 +1355,7 @@
     <string name="sim_pin_change" msgid="5978881209990507379">"‏تغيير رقم التعريف الشخصي لشريحة SIM"</string>
     <string name="sim_enter_pin" msgid="8235202785516053253">"‏رقم التعريف الشخصي لشريحة SIM"</string>
     <string name="sim_enable_sim_lock" msgid="8993991669975548653">"‏قفل شريحة SIM"</string>
-    <string name="sim_disable_sim_lock" msgid="7656447857474746157">"‏إلغاء قفل شريحة SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="7656447857474746157">"‏فتح قفل شريحة SIM"</string>
     <string name="sim_enter_old" msgid="6882545610939674813">"‏رقم التعريف الشخصي القديم لشريحة SIM"</string>
     <string name="sim_enter_new" msgid="9010947802784561582">"‏رقم تعريف شخصي جديد لبطاقة SIM"</string>
     <string name="sim_reenter_new" msgid="6131418271490374263">"إعادة كتابة رقم التعريف الشخصي الجديد"</string>
@@ -1566,7 +1567,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"‏تعمل <xliff:g id="NAME">^1</xliff:g> الجديدة. \n\nلنقل الصور والملفات وبيانات التطبيقات إلى هذا الجهاز، انتقل إلى الإعدادات &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="APP">^1</xliff:g> والبيانات التابعة له إلى <xliff:g id="NAME_0">^2</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>
+    <string name="storage_wizard_move_unlock" msgid="14651384927767749">"لنقل البيانات، يجب فتح قفل المستخدم <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"جارٍ نقل <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء عملية النقل. \n\nولن يكون التطبيق <xliff:g id="APP">^2</xliff:g> على هذا الجهاز متاحًا حتى الانتهاء من عملية النقل."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="3494022998599718937">"إلغاء عملية النقل"</string>
@@ -1686,7 +1687,7 @@
     <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_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="call_settings_title" msgid="2531072044177194164">"اعدادات المكالمات"</string>
@@ -1761,7 +1762,7 @@
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"‏السماح للتطبيقات باستخدام GPS على جهازك اللوحي لتحديد موقعك"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"‏السماح للتطبيقات باستخدام GPS على هاتفك لتحديد موقعك"</string>
     <string name="assisted_gps" msgid="1714546606018821498">"‏استخدام نظام GPS المساعد"</string>
-    <string name="assisted_gps_enabled" msgid="6220188450779319248">"‏استخدام الخادم لمساعدة GPS (إلغاء التحديد لتقليل استخدام الشبكة)"</string>
+    <string name="assisted_gps_enabled" msgid="6220188450779319248">"‏استخدام الخادم لمساعدة GPS (إلغاء الاختيار لتقليل استخدام الشبكة)"</string>
     <string name="assisted_gps_disabled" msgid="1062496503892849">"‏استخدام الخادم لمساعدة GPS (ألغِ التحديد لتحسين أداء GPS)"</string>
     <string name="use_location_title" msgid="1345594777162897654">"‏الموقع وبحث Google"</string>
     <string name="use_location_summary" msgid="377322574549729921">"‏السماح لـ Google باستخدام الموقع لتحسين نتائج البحث والخدمات الأخرى"</string>
@@ -1802,12 +1803,15 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"لاستخدام بصمة الإصبع، يُرجى إعداد رقم تعريف شخصي"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"لتعزيز أمان الجهاز، يجب تحديد نقش"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"أعِد إدخال كلمة المرور"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"أدخِل كلمة مرور العمل"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"تأكيد نقشك"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"أدخِل نقش العمل"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"أعِد إدخال رقم التعريف الشخصي"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"أدخِل رقم التعريف الشخصي للعمل"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ارسم النقش مرة أخرى"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="5669348379247148696">"تحديد طريقة إلغاء القفل"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="5669348379247148696">"تحديد طريقة فتح القفل"</string>
     <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"تم تعيين كلمة المرور"</string>
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"‏تم تعيين رمز PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="3090582314362416762">"تم تعيين النقش"</string>
@@ -1826,9 +1830,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"استخدام نقش للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"إدخال رقم تعريف شخصي للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"إدخال كلمة مرور للملف الشخصي للعمل لزيادة الأمان"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"التحقق من النقش"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"التحقق من رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"التحقق من كلمة المرور"</string>
@@ -2143,24 +2147,26 @@
     <string name="talkback_summary" msgid="5820927220378864281">"إن تطبيق قارئ الشاشة مُصمَّم في الأساس من أجل الأشخاص الكفيفين والذين يعانون من ضعف في النظر."</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للترجمة"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"التكبير"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"تكبير"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"منطقة التكبير"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"إظهار وحدة التحكم في النقل"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"إظهار وحدة التحكم الشبيهة بذراع التحكم لنقل منطقة التكبير"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"إعدادات التكبير"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"التكبير باستخدام الزر والنقر الثلاثي"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"لمحة عن الميزة \"تكبير\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"الخيارات"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"التكبير على الشاشة"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"انقر ٣ مرات للتكبير."</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"انقر على أحد الأزرار للتكبير"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2831926970059739911"><b>"للتكبير/التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2831926970059739911"><b>"للتكبير أو التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير أو التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"عند تفعيل ميزة \"التكبير\"، يمكنك تكبير حجم المحتوى على الشاشة.\n\n"<b>"للتكبير"</b>"، يمكنك تفعيل ميزة \"التكبير\" والنقر بعد ذلك على أي مكان في الشاشة.\n"<ul><li>"يمكنك سحب إصبعين أو أكثر للتمرير."</li>\n<li>"يمكنك ضمّ إصبعين أو أكثر لتعديل حجم المحتوى."</li></ul>\n\n<b>"للتكبير مؤقتًا"</b>"، يمكنك تفعيل ميزة التكبير والنقر مع الاستمرار على أي مكان في الشاشة.\n"<ul><li>"يمكنك السحب للتنقّل داخل الشاشة."</li>\n<li>"يمكنك رفع إصبعك للتصغير."</li></ul>\n\n"لن يكون بإمكانك التكبير على لوحة المفاتيح أو شريط التنقل."</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"استخدام زر \"سهولة الاستخدام\" في الفتح"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"الفتح بحركة واحدة"</string>
@@ -2210,7 +2216,7 @@
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"وقت اتخاذ إجراء (مهلة سهولة الاستخدام)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"وقت اتخاذ الإجراء"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"اختَر مدة عرض الرسائل التي تطلب منك اتخاذ إجراء، ولكن يقتصر عرضها على فترة مؤقتة.\n\nلا تتوافق بعض التطبيقات مع هذا الإعداد."</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"مهلة اللمس مع الاستمرار"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"مهلة النقر مع الاستمرار"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"عكس اللون"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="1306705652558953204">"قلب الألوان"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="3302345676503045665">"يمكنك تقليل درجة سطوع الشاشات حتى يحصل من يعانون من حساسية ضد الإضاءة الساطعة على تجربة مشاهدة أفضل.\n\nملاحظة: ستتحوّل الألوان الغامقة إلى فاتحة. وسيتم قلب ألوان الصور أيضًا."</string>
@@ -2864,7 +2870,7 @@
     <string name="misc_files" msgid="6598066985800749585">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="7622766714974500289">"<xliff:g id="NUMBER">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="select_all" msgid="7898929601615536401">"تحديد الكل"</string>
+    <string name="select_all" msgid="7898929601615536401">"اختيار الكل"</string>
     <string name="data_usage_summary_title" msgid="394067070764360142">"استخدام البيانات"</string>
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"‏بيانات الجوّال وWi‑Fi"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"قد تختلف طريقة احتساب بيانات مشغّل شبكة الجوّال عن طريقة الاحتساب على جهازك."</string>
@@ -3252,6 +3258,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"‏تحديد شريحة SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"برتقالي"</string>
     <string name="color_purple" msgid="6603701972079904843">"أرجواني"</string>
+    <string name="color_pink" msgid="8596872110888626708">"قرنفلي"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"‏لم يتم إدراج بطاقات SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"‏وضع شريحة SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"‏حالة شريحة SIM (المنفذ %1$d لشريحة SIM)"</string>
@@ -3321,7 +3328,7 @@
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"تقييم، لغة، تلقائي، يتحدث، تحدث، تحويل نص إلى كلام، سهولة الاستخدام، قارئ شاشة، مكفوف"</string>
     <string name="keywords_date_and_time" msgid="4402136313104901312">"ساعة، عسكرية"</string>
     <string name="keywords_network_reset" msgid="4075670452112218042">"إعادة ضبط، استرداد، المصنع"</string>
-    <string name="keywords_factory_data_reset" msgid="4979623326958976773">"مسح، حذف، استعادة، محو، إزالة، إعادة الضبط بحسب إعدادات المصنع"</string>
+    <string name="keywords_factory_data_reset" msgid="4979623326958976773">"مسح، حذف، استعادة، محو، إزالة، إعادة الضبط على الإعدادات الأصلية"</string>
     <string name="keywords_printing" msgid="3528250034669909466">"طابعة"</string>
     <string name="keywords_sounds" msgid="1850691834585575875">"صفارة مكبر الصوت، مكبر صوت، مستوى الصوت، كتم الصوت، صامت، صوت، موسيقى"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"ممنوع الإزعاج، ممنوع، المقاطعة، مقاطعة"</string>
@@ -3422,6 +3429,7 @@
       <item quantity="one">تم تفعيل قاعدة واحدة.</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"تشغيل وضع \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"الاستثناءات"</string>
@@ -3448,7 +3456,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"حظر الإشعارات المرئية"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"السماح بالإشارات المرئية"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"عند تفعيل إعداد \"عدم الإزعاج\""</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"السماح بالمقاطعات التي تصدر صوتًا"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"تقييد الإشعارات"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"بدون تنبيهات صوتية من الإشعارات"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"سترى الإشعارات على شاشتك"</string>
@@ -3517,10 +3525,12 @@
       <item quantity="other">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني تلقائيًا.</item>
       <item quantity="one">يمكن تفعيل جدول زمني واحد تلقائيًا.</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"كتْم صوت الجهاز مع السماح باستثناءات"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"الاستثناءات"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"الجدول الزمني"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"عرض جميع الاستثناءات"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"الاستثناءات عند تفعيل إعداد \"عدم الإزعاج\""</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_schedule" msgid="2003707171924226212">"الجداول الزمنية"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"الإشعارات التي تم كتم صوتها"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"عند تفعيل الوضع \"عدم الإزعاج\"، سيتم كتم الصوت ومنع الاهتزاز عند تلقّي أي عناصر باستثناء تلك التي تسمح بها أعلاه."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"تمّ كتم جميع الأصوات باستثناء"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"تمّ كتم الصوت."</string>
@@ -3609,7 +3619,7 @@
     <string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"الإشعارات الحساسة بالملف الشخصي للعمل"</string>
     <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"عرض المحتوى الحسّاس بالملف الشخصي للعمل عند قفل الجهاز"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"عرض محتوى الإشعارات كاملاً"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"عرض محتوى حسّاس عند إلغاء القفل فقط"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"عرض محتوى حسّاس عند فتح القفل فقط"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"عدم عرض إشعارات على الإطلاق"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4688399629301178487">"كيف تريد عرض شاشة التأمين؟"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"شاشة القفل"</string>
@@ -3808,6 +3818,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخص آخر</item>
       <item quantity="one">شخص واحد آخر</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"المحادثات"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"السماح بالرسائل"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"للتأكُد من إصدار الرسائل المسموح بها لتنبيه صوتي، تحقَّق من ضبط جهازك على الرنين أو الاهتزاز أو الصمت."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"وفقًا للجدول الزمني \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\"، يتم حظر الرسائل الواردة. ويمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
@@ -3821,15 +3832,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"لا أحد"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"حظر تلقّي أي مكالمات"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"حظر تلقّي أي رسائل"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"السماح بالمنبّهات"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"التنبيهات"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"من الموقتات والإنذارات وأنظمة الأمان والتطبيقات الأخرى"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"المنبِّهات"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"تشغيل أصوات الوسائط"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"أصوات الوسائط"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"من الفيديوهات والألعاب والوسائط الأخرى"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"الوسائط"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"السماح بأصوات اللمس"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"أصوات اللمس"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"من لوحة المفاتيح والأزرار الأخرى"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"أصوات اللمس"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"السماح بالتذكيرات"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"التذكيرات"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"من المهام والتنبيهات"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"التذكيرات"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"السماح بالأحداث"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"الأحداث"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"من أحداث التقويم القادمة"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"السماح للتطبيقات بإلغاء وضع \"عدم الإزعاج\""</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"التطبيقات المُستثناة"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4081,8 +4097,8 @@
     <string name="additional_permissions" msgid="4656871347558988462">"أذونات إضافية"</string>
     <string name="additional_permissions_more" msgid="8188145515437525307">"<xliff:g id="COUNT">%1$d</xliff:g> أخرى"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"هل تريد مشاركة تقرير الخطأ؟"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحرِّي مشكلة هذا الجهاز وإصلاحها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحرِّي مشكلة هذا الجهاز وإصلاحها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات، كما يمكن أن تبطَأ سرعة تشغيل جهازك مؤقتًا."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحديد مشكلة هذا الجهاز وحلّها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحديد مشكلة هذا الجهاز وحلّها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات، كما يمكن أن تبطَأ سرعة تشغيل جهازك مؤقتًا."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"تتم مشاركة تقرير الخطأ هذا مع مشرف تكنولوجيا المعلومات. اتصل به للحصول على المزيد من التفاصيل."</string>
     <string name="share_remote_bugreport_action" msgid="7173093464692893276">"مشاركة"</string>
     <string name="decline_remote_bugreport_action" msgid="1276509879613158895">"رفض"</string>
@@ -4169,6 +4185,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"إظهار فوق التطبيقات الأخرى"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"السماح بظهور التطبيق فوق التطبيقات الأخرى"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"السماح بعرض واجهة هذا التطبيق فوق تطبيقات أخرى تستخدمها. وقد يتداخل التطبيق مع استخدامك لهذه التطبيقات أو يغيِّر طريقة ظهورها أو عملها."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"الوصول إلى كل الملفات"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"السماح بالوصول إلى كل الملفات لإدارتها"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"يسمح هذا الإعداد لهذا التطبيق بقراءة كل الملفات وتعديلها وحذفها من هذا الجهاز أو أي وحدات تخزين متصلة. في حال تفعيله، يمكن أن يصل التطبيق إلى الملفات بدون إعلامك بذلك."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"يمكن الوصول إلى كل الملفات"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"خدمة مساعد استريو مستمع الواقع الافتراضي"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"إظهار فوق التطبيقات الأخرى"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"يتم السماح لعدد <xliff:g id="COUNT_0">%1$d</xliff:g> من <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق بالظهور فوق التطبيقات الأخرى"</string>
@@ -4191,7 +4211,7 @@
     <string name="camera_gesture_title" msgid="5559439253128696180">"يمكنك اللف مرتين لفتح الكاميرا"</string>
     <string name="camera_gesture_desc" msgid="7557645057320805328">"يمكنك فتح تطبيق الكاميرا من خلال لف رسغك مرتين"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="8264757967127716261">"اضغط على زر التشغيل مرتين لتشغيل الكاميرا"</string>
-    <string name="camera_double_tap_power_gesture_desc" msgid="1539147023700755155">"فتح الكاميرا سريعًا بدون إلغاء تأمين الشاشة"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="1539147023700755155">"فتح الكاميرا سريعًا بدون فتح قفل الشاشة"</string>
     <string name="screen_zoom_title" msgid="6928045302654960559">"حجم العرض"</string>
     <string name="screen_zoom_short_summary" msgid="2458636490408833800">"يمكنك تكبير العناصر المعروضة على الشاشة أو تصغيرها."</string>
     <string name="screen_zoom_keywords" msgid="5964023524422386592">"عرض، كثافة، شاشة تصغير/تكبير، تغيير الحجم، ضبط الحجم"</string>
@@ -4388,7 +4408,7 @@
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"رقم التعريف الشخصي مطلوب لبدء تشغيل جهازك. ويتعذر على هذا الجهاز استقبال المكالمات أو الرسائل أو الإشعارات أو التنبيهات أثناء إيقاف تشغيله."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"كلمة المرور مطلوبة لبدء تشغيل جهازك. ويتعذر على هذا الجهاز استقبال المكالمات أو الرسائل أو الإشعارات أو التنبيهات أثناء إيقاف تشغيله."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"إضافة بصمة إصبع أخرى"</string>
-    <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"إلغاء القفل باستخدام إصبع مختلف"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"فتح القفل باستخدام إصبع مختلف"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"مفعّل"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"سيتم التشغيل تلقائيًا عند الوصول إلى <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="4411561435493109261">"غير مفعّل"</string>
@@ -4561,7 +4581,7 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="2956636269742745449">"الاطّلاع على الإشعارات بسرعة"</string>
     <string name="gesture_setting_on" msgid="3223448394997988591">"مفعّل"</string>
     <string name="gesture_setting_off" msgid="3444029475726294919">"غير مفعّل"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="65713754674288193">"تم إلغاء قفل برنامج التحميل مسبقاً"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="65713754674288193">"تم فتح قفل برنامج التحميل مسبقاً"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="8045017109714463041">"الاتصال بالإنترنت أولاً"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="7425519481227423860">"الاتصال بالإنترنت أو الاتصال بمشغِّل شبكة الجوّال"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"عدم التوفر على الأجهزة التي يقفلها مشغل شبكة الجوال"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 3e1b176..a1fada3 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"মোৰ অৱস্থান, স্ক্ৰীণ আনলক, ছিম কাৰ্ডৰ লক, ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰৰ লক ছেট কৰক"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"মোৰ অৱস্থান, স্ক্ৰীণ আনলক, ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰৰ লক ছেট কৰক"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"গোপনীয়তা"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"প্ৰশাসকে অক্ষম কৰিছে"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"উপলব্ধ নহয়"</string>
     <string name="security_status_title" msgid="6958004275337618656">"সুৰক্ষা স্থিতি"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্ৰীণ লক, ফে’চ আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্ৰীণ লক, ফিংগাৰপ্ৰিণ্ট"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"মুখাৱয়বেৰে আনলক কৰা সুবিধাৰে এপ্‌ খোলোঁতে প্ৰতিবাৰেই নিশ্চিতকৰণৰ প্ৰয়োজন"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"মুখমণ্ডলৰ ডেটা মচক"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধা ছেটআপ কৰক"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"আপোনাৰ ডিভাইচ আনলক কৰিবলৈ, এপত ছাইন ইন কৰিবলৈ আৰু পৰিশোধসমূহ নিশ্চিত কৰিবলৈ মুখাৱয়বৰ দ্বাৰা খোলাৰ সুবিধা ব্যৱহাৰ কৰক।\n\nমনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব।\n\nআপোনাৰ দুচকু খোলা ৰাখিলে আন কোনোবাই ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰিও সেইটো আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত প্ৰায় আপোনাৰ দৰে, যেনে আপোনাৰ সন্তান বা দেখাত একেই ভাতৃ-ভগ্নী।"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"আপোনাৰ ডিভাইচ আনলক কৰিবলৈ, এপত ছাইন ইন কৰিবলৈ আৰু পৰিশোধসমূহ নিশ্চিত কৰিবলৈ মুখাৱয়বৰ দ্বাৰা খোলাৰ সুবিধাটো ব্যৱহাৰ কৰক।\n\nমনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nঅন্য কোনোবাই আপোনাৰ ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত প্ৰায় আপোনাৰ দৰে, যেনে একেই সহোদৰ-সহোদৰা।"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰক, এপ্‌সমূহত ছাইন ইন কৰক আৰু পৰিশোধসমূহ নিশ্চিত কৰক।\n\n মনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nআপোনাৰ দুচকু বন্ধ হৈ থাকিলেও আন কোনোবাই ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি সেইটো আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত বহুখিনি আপোনাৰ দৰে, যেনে দেখাত একেই সহোদৰ-সহোদৰা।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"মুখমণ্ডলৰ ডেটা মচিবনে?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটোৱে ব্যৱহাৰ কৰা মুখাৱয়ব সম্পৰ্কীয় ডেটা স্থায়ী আৰু সুৰক্ষিতভাৱে মচা হ’ব। আঁতৰোৱাৰ পাছত, আপোনাৰ ফ’নটো আনলক কৰিবলৈ, এপ্‌সমূহত ছাইন ইন কৰিবলৈ আৰু পৰিশোধসমূহ নিশ্চিত কৰিবলৈ আপোনাক নিজৰ পিন, আৰ্হি অথবা পাছৱৰ্ডৰ প্ৰয়োজন হ’ব।"</string>
@@ -766,8 +766,7 @@
     <string name="wifi_tap_to_sign_in" msgid="8658506618807549483">"নেটৱৰ্কত ছাইন ইন কৰিবলৈ ইয়াত টিপক"</string>
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> এম.বি./ছেকেণ্ডত"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> এম.বি./ছেকেণ্ডত"</string>
-    <!-- no translation found for link_speed (931786745741016446) -->
-    <skip />
+    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> এমবিপিএছ"</string>
     <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g>এ ৱাই-ফাই অন কৰিব বিচাৰে"</string>
     <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> এ ৱাই-ফাই অফ কৰিব বিচাৰিছে"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"debuggable এপৰ bytecode সত্যাপন কৰক"</string>
@@ -775,10 +774,8 @@
     <string name="show_refresh_rate" msgid="5742688821872354973">"ৰিফ্ৰেশ্বৰ হাৰ দেখুৱাওক"</string>
     <string name="show_refresh_rate_summary" msgid="3558118122374609663">"বৰ্তমানৰ ডিছপ্লে’ ৰিফ্ৰেশ্বৰ হাৰ দেখুৱাওক"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
-    <!-- no translation found for nfc_quick_toggle_summary (3622326550467939809) -->
-    <skip />
-    <!-- no translation found for nfc_quick_toggle_summary (1460871052409162980) -->
-    <skip />
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"টেবলেটটোৱে এটা NFC ডিভাইচ স্পর্শ কৰিলে ডেটা বিনিময় কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"ফ\'নটোৱে এটা NFC ডিভাইচ স্পর্শ কৰিলে ডেটা বিনিময় কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"NFC অন কৰক"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFCএ এইটো ডিভাইচ আৰু অন্যান্য নিকটৱৰ্তী ডিভাইচসমূহ বা লক্ষ্যসমূহ যেনে পৰিশোধ টাৰ্মিনেল, এক্সেছ ৰিডাৰ আৰু ইণ্টাৰেক্টিভ এড বা টেগসমূহৰ মাজত ডেটা বিনিময় কৰিব পাৰে৷"</string>
     <string name="nfc_secure_settings_title" msgid="8947380729696717356">"সুৰক্ষিত NFC"</string>
@@ -880,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"পৰিচয়"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"পৰিচয় অজ্ঞাত"</string>
     <string name="wifi_password" msgid="1458802324849513755">"পাছৱৰ্ড"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE পাছৱৰ্ড আইডেণ্টিফায়াৰ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"পাছৱৰ্ড দেখুৱাওক"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP বেণ্ড বাছনি কৰক"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"স্বয়ংক্ৰিয়"</string>
@@ -921,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"এই ডিভাইচটোৰ সৈতে ৱাই-ফাই শ্বেয়াৰ কৰি থকা হৈছে…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"সংযোগ কৰি থকা হৈছে…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"হ’টস্প’ট শ্বেয়াৰ কৰক"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"এইজন আপুনি বুলি ভেৰিফাই কৰক"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"এইজন আপুনিয়েই বুলি সত্যাপন কৰক"</string>
     <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" 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>
@@ -1229,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"অন / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"কেতিয়াও স্বয়ংক্ৰিয়ভাৱে অফ নহ’ব"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"সূৰ্যোদয়ৰ সময়ত স্বয়ংক্ৰিয়ভাৱে অফ হ’ব"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"আপোনাৰ বেটাৰীটোত চাৰ্জ অধিক সময়ৰ বাবে ৰখাত সহায় কৰিবলৈ গাঢ় ৰঙৰ থীমে গাঢ় ক’লা ৰং ব্যৱহাৰ কৰে। গাঢ় ৰঙৰ থীমে আপোনাৰ স্ক্রীনখন অফ হোৱালৈ অপেক্ষা কৰিবলগীয়া সময় নিৰ্ধাৰণ কৰে।"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"আপোনাৰ বেটাৰীটোত চাৰ্জ কিছুমান স্ক্ৰীনত অধিক সময়ৰ বাবে ৰখাত সহায় কৰিবলৈ গাঢ় ৰঙৰ থীমে গাঢ় ক’লা ৰং ব্যৱহাৰ কৰে। গাঢ় ৰঙৰ থীমে আপোনাৰ স্ক্রীনখন অফ হোৱালৈ অপেক্ষা কৰিবলগীয়া সময় নিৰ্ধাৰণ কৰে।"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"স্ক্রীণ বন্ধ হোৱা সময়"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"স্ক্ৰীণ অফ হৈ যায়"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"নিস্ক্ৰিয় হৈ থকাৰ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> পিছৰ"</string>
@@ -1717,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিবলৈ এটা পিন ছেট কৰক"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"সুৰক্ষাৰ বাবে আৰ্হি দিয়ক"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"আপোনাৰ পাছৱৰ্ডটো আকৌ দিয়ক"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"আপোনাৰ কর্মস্থানৰ পাছৱৰ্ড দিয়ক"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"আপোনাৰ আৰ্হি নিশ্চিত কৰক"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"আপোনাৰ কর্মস্থানৰ আর্হি দিয়ক"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"আপোনাৰ পিনটো আকৌ দিয়ক"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"আপোনাৰ কর্মস্থানৰ পিন দিয়ক"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"পাছৱৰ্ড দুটা একেই নহয়"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"পিনবিলাক মিলা নাই"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"আপোনাৰ আৰ্হিটো আকৌ আঁকক"</string>
@@ -2054,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"স্ক্ৰীণ ৰীডাৰ সেৱা প্ৰধানতঃ অন্ধ আৰু চকুৰে কম দেখা লোকৰ বাবে"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ডাঙৰকৈ পঢ়ি দিয়া শুনিবলৈ স্ক্ৰীণত থকা বস্তুবোৰ স্পৰ্শ কৰক"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"কেপশ্বনৰ অগ্ৰাধিকাৰসমূহ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বিবৰ্ধন"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"বিবৰ্ধন কৰক"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বিবৰ্ধন কৰা অংশ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"স্থানান্তৰ কৰাৰ নিয়ন্ত্ৰক দেখুৱাওক"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"বিবৰ্ধন কৰা অংশ স্থানান্তৰ কৰিবলৈ এডাল জয়ষ্টিকৰ দৰে নিয়ন্ত্ৰক দেখুৱাওক"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ছেটিংসমূহ বিবৰ্ধন কৰক"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"শ্বৰ্টকাটৰ দ্বাৰা আৰু তিনিবাৰ টিপি বিৱৰ্ধিত কৰক"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"বিবৰ্ধন কৰাৰ বিষয়ে"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"বিকল্পসমূহ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"স্ক্ৰীণ জুম কৰক"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"জুম কৰিবলৈ ৩ বাৰ টিপক"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"জুম কৰিবলৈ এটা বুটাম টিপক"</string>
@@ -3087,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ছিম কাৰ্ড বাছনি কৰক"</string>
     <string name="color_orange" msgid="216547825489739010">"কমলা"</string>
     <string name="color_purple" msgid="6603701972079904843">"বেঙুনীয়া"</string>
+    <string name="color_pink" msgid="8596872110888626708">"গুলপীয়া"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"কোনো ছিম কাৰ্ড ভৰোৱা নাই"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ছিমৰ স্থিতি"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ছিমৰ স্থিতি (ছিমৰ শ্লট %1$d)"</string>
@@ -3127,8 +3131,7 @@
     <string name="search_results_title" msgid="3360639917793022533">"ছেটিংসমূহ"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"ৱাইফাই, ৱাই-ফাই, নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেঁতাৰ, ডেটা, ৱাই ফাই"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"ৱাই-ফাই জাননী, ৱাইফাই জাননী"</string>
-    <!-- no translation found for keywords_wifi_data_usage (4718555409695862085) -->
-    <skip />
+    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"ডেটাৰ ব্যৱহাৰ"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"কম্পন বন্ধ কৰক, টিপক, কীব’ৰ্ড"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"২৪ ঘণ্টীয়া ফৰমেট ব্যৱহাৰ কৰক"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"ডাউনল’ড কৰক"</string>
@@ -3250,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টা সক্ষম কৰা হ’ল</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"অসুবিধা নিদিব অন কৰক"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ব্যতিক্রম"</string>
@@ -3276,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"দৃশ্যমান বিঘিনি প্ৰতিৰোধ কৰক"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"দৃশ্যমান সংকেতৰ অনুমতি দিয়ক"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"‘অসুবিধা নিদিব ম\'ড’ অন হৈ থাকিলে"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ধ্বনিৰ সৃষ্টি কৰা বাধাসমূহৰ বাবে অনুমতি দিয়ক"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"জাননী সীমিত কৰক"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"জাননীৰ লগত জড়িত ধ্বনি নিষেধ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"আপুনি স্ক্ৰীণত জাননী দেখা পাব"</string>
@@ -3337,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"ডিভাইচটো মিউট কৰক কিন্তু ব্যতিক্ৰমসমূহক অনুমতি দিয়ক"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ব্যতিক্রম"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"সূচীৰ পৰা"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"সকলো ব্যতিক্ৰম দেখুৱাওক"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"‘অসুবিধা নিদিব ম\'ড’ অন হৈ থকা অৱস্থাৰ ব্যতিক্ৰমসমূহ"</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_schedule" msgid="2003707171924226212">"সময়সূচী"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"অসুবিধা নিদিবৰ বাবে থকা জাননীসমূহ"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে ধ্বনি আৰু কম্পনক মিউট কৰা হ\'ব।"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ইয়াৰ বাহিৰে সকলোকে মিউট কৰক"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"মিউট আছে"</string>
@@ -3600,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"বাৰ্তালাপসমূহ"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"বাৰ্তাৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"অনুমতি দিয়া নম্বৰৰ পৰা বাৰ্তা আহিলে যাতে ধ্বনি বজোৱা হয় তাক নিশ্চিত কৰিবলৈ আপোনাৰ ডিভাইচটো ৰিং কৰিবলৈ, কম্পন কৰিবলৈ বা নীৰৱ হৈ থাকিবলৈ ছেট কৰা আছে পৰীক্ষা কৰক।"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ ক্ষেত্ৰত অন্তৰ্গামী বাৰ্তাসমূহ অৱৰোধ কৰা হয়। আপুনি আপোনাৰ বন্ধুবৰ্গ, পৰিয়ালৰ লোক বা অইন সম্পৰ্কসমূহে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
@@ -3613,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"নাই"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"কোনো কলৰ অনুমতি নিদিব"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"বাৰ্তাৰ অনুমতি নিদিব"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"এলাৰ্ম এক্সেছ কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"এলাৰ্মসমূহ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"টাইমাৰ, এলার্ম, সুৰক্ষাৰ ছিষ্টেমসমূহ আৰু অন্য এপ্‌সমূহৰ পৰা"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"এলাৰ্ম"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"মিডিয়া ধ্বনি বজাওক"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"মিডিয়া ধ্বনিসমূহ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ভিডিঅ\', গে\'ম আৰু অন্য মিডিয়াৰ পৰা"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"মিডিয়া"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"স্পৰ্শৰ ধ্বনি এক্সেছ কৰাৰ অনুমতি দিয়ক"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"স্পৰ্শৰ ধ্বনিবোৰ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"আপোনাৰ কীবর্ড আৰু অন্য বুটামসমূহৰ পৰা"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"স্পৰ্শৰ ধ্বনি"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"ৰিমাইণ্ডাৰ এক্সেছ কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"সোঁৱৰণিসমূহ"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"কাম আৰু ৰিমাইণ্ডাৰসমূহৰ পৰা"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ৰিমাইণ্ডাৰ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"কাৰ্যক্ৰমসমূহ চাবলৈ অনুমতি দিয়ক"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"কাৰ্যক্ৰমসমূহ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"অনাগত কেলেণ্ডাৰৰ অনুষ্ঠানসমূহৰ পৰা"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"এপক অ\'ভাৰৰাইডৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ব্যতিক্ৰম যোগ কৰক"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3917,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"অন্য এপসমূহত দেখুৱাওক"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"অইন এপৰ ওপৰত দেখুৱাবলৈ অনুমতি দিয়ক"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"আপুনি ব্যৱহাৰ কৰি থকা অইন এপৰ ওপৰত দেখুৱাবলৈ এই এপটোক অনুমতি দিয়ক। ইয়ে আপুনি ব্যৱহাৰ কৰি থকা এপসমূহ চলাত ব্যাঘাত জন্মাব পাৰে বা সেইবিলাক স্ক্ৰীণত কেনেধৰণে ওলাই বা আচৰণ কৰে তাক সলনি কৰিব পাৰে।"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"সকলো ফাইলৰ এক্সেছ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"সকলো ফাইল পৰিচালনা কৰিবলৈ এক্সেছ দিয়ক"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"এই এপ্‌টোক এই ডিভাইচটোত অথবা অন্য যিকোনো সংযুক্ত ষ্ট\'ৰৰ ভলিউমসমূহত সকলো ফাইল পঢ়িব, সংশোধন কৰিব আৰু মচিবলৈ অনুমতি দিয়ক। যদি অনুমতি দিয়ে, আপোনাৰ নিশ্চিত জ্ঞানৰ অবিহনে এপে ফাইলবোৰ এক্সেছ কৰিব পাৰে।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"সকলো ফাইল এক্সেছ কৰিব পাৰে"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"ভিআৰ ভাৰ্শ্বুৱেল ৰিয়েলিটি শ্ৰোতা ষ্টেৰিঅ\' সহায়ক সেৱা"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"অন্য এপৰ ওপৰত দেখুৱাওক"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>ৰ ভিতৰত <xliff:g id="COUNT_0">%1$d</xliff:g> টা এপক অন্য এপ্‌সমূহত প্ৰদৰ্শিত হ’বলৈ অনুমতি দিছে"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index eedd2da..7d1e8e5 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Məxfilik"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Admin tərəfindən deaktiv edildi"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Əlçatmazdır"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Təhlükəsizlik statusu"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, üzün kiliddən çıxarılması"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, barmaq izi"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Tətbiqlərdə üz kilidi istifadə etdikdə həmişə təsdiq tələb edin"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Üz datasını silin"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Üz kilidi ayarlayın"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Cihazı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz kilidindən istifadə edin.\n\nUnutmayın:\nAçmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nTelefon gözləriniz açıq halda üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, həmçinin övladınız və ya oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Cihazı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz ilə kiliddən çıxarmadan istifadə edin.\n\nUnutmayın:\nTelefona baxmaqla istəmədiyiniz halda belə onu kiliddən çıxara bilərsiniz.\n\nTelefon üzünüzə tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, əkiziniz kimi sizə çox bənzəyən şəxs tərəfindən kiliddən çıxarıla bilər."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Cihazı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz kilidindən istifadə edin.\n\nUnutmayın:\nAçmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nHətta gözləriniz bağlı halda telefon üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, həmçinin Sizə oxşayan övladınız və ya oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Üz datası silinsin?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Üz ilə kiliddən çıxarma üçün istifadə edilən üz datası həmişəlik və təhlükəsiz silinəcək. Silindikdən sonra telefonu kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün PIN, model və ya parol tələb ediləcək."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"İdentiklik"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonim kimlik"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Parol"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE parol identifikatoru"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Parolu göstər"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP Band Seçin"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Avtomatik"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi bu cihazla paylaşılır…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Qoşulur..."</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspot\'u paylaşın"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Siz olduğunuzu təsdiqləyin"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Siz olduğunuzu doğrulayın"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktiv/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Heç vaxt avtomatik deaktiv olmayacaq"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Gün çıxanda avtomatik deaktiv olacaq"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tünd tema batareya istifadəsini artırmaq üçün əsl qara rəngdən istifadə edir. Tünd tema ekran sönənə qədər gözləmə vaxtının aktiv olmasını planlaşdırır."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tünd tema bəzi ekranlarda batareya istifadəsini artırmaq üçün qara arxa fondan istifadə edir. Tünd tema ekran sönənə qədər gözləmə vaxtının aktiv olmasını planlaşdırır."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Avtomatik ekran sönməsi"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekran sönür"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Barmaq izi üçün PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Təhlükəsizlik üçün nümunə ayarlayın"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Parolu yenidən daxil edin."</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"İş parolunuzu daxil edin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Modeli təsdiq edin"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"İş modelinizi daxil edin"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN\'i yenidən daxil edin"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"İş PIN kodunuzu daxil edin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Parollar uyğun gəlmir"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-lər üst-üstə düşmür"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Modeli yenidən çəkin"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Ekran oxucusu əsasən korluq və aşağı görmə qabiliyyəti olan insanlar üçündür"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Səsli oxunuş üçün ekrandakı elementlərə toxunun"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Böyütmə"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Böyütmə sahəsi"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Daşıma nizamlayıcısını göstərin"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Böyütmə sahəsini daşımaq üçün coystik kimi nizamlayıcı göstərin"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Böyütmə ayarları"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Qısayol &amp; üç toxunuşla böyüdün"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Böyütmə haqqında"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Seçimlər"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ekranda yaxınlaşdırın"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Miqyası dəyişmək üçün 3 dəfə tıklayın"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Yaxınlaşdırmaq üçün düyməyə klikləyin"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM kart seçin"</string>
     <string name="color_orange" msgid="216547825489739010">"Narıncı"</string>
     <string name="color_purple" msgid="6603701972079904843">"Bənövşəyi"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Çəhrayı"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Heç bir SIM kart taxılmayıb"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM statusu"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM statusu (sim slot %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 nəzarət aktiv edildi</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Narahat Etməyin\" rejimini aktiv edin"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"İstisnalar"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vizual fəsadları blok edin"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Görünən siqnallara icazə verin"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Narahat Etməyin rejimi aktiv olduqda"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Səsli xəbərdarlıqlara icazə verin"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Bildirişləri məhdudlaşdırın"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirişlər səs çıxarmır"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Ekranda bildirişləri görəcəksiniz"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"İstisnalara icazə verməklə telefonu səssiz rejimə keçirin"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"İstisnalar"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Cədvəl"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Bütün istisnalara baxın"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Narahat Etməyin rejimi aktiv olduqda istisnalar"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Şəxslər"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Tətbiqlər"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Siqnallar və digər xəbərdarlıqlar"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Cədvəllər"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Səssiz bildirişlər"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"\"Narahat Etməyin\" rejimi aktiv olduğu zaman, yuxarıda icazə verdiyiniz elementlərdən başqa səs və vibrasiya susdurulacaq."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Hamısını susdurun"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Səssiz"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Söhbətlər"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Mesajlara icazə verin"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"İcazəli mesajların səsli olduğuna əmin olmaq üçün cihazın səsli, vibrasiya yoxsa səssiz olaraq ayarlanıb-ayarlanmadığını yoxlayın."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Heç biri"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Zəngələrə icazə verməyin"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Mesaja icazə verməyin"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Siqnallara icazə verin"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Siqnallar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Taymerlər, siqnallar, təhlükəsizlik sistemləri və digər tətbiqlərdən"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"siqnallar"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Media səslərini oxudun"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media səsləri"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Videolar, oyunlar və digər mediadan"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Toxunuş səslərinə icazə verin"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Toxunma səsləri"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Klaviatura və digər düymələrdən"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"klik səsləri"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Xatırladıcılara icazə verin"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Xatırlamalar"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Tapşırıqlar və xatırladıcılardan"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"xatırlatmalar"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Tədbirlərə icazə verin"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Tədbirlər"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Gələcək təqvim tədbirlərindən"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tətbiqlərin rejimdən imtina etməsinə icazə verin"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Tətbiq istisnaları"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Tətbiqlər üzərindən görüntüləmə"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Digər tətbiq üzərindən görüntüləmək icazəsi"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Bu tətbiqə istifadə etdiyiniz digər tətbiqlərin üzərində göstərilmək icazəsi verin. Bu tətbiq həmin tətbiqlərin istifadəsinə müdaxilə edə və ya tətbiqlərin görünüş və davranışını dəyişə bilər."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Bütün fayllara giriş"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Bütün faylları idarə etmək üçün giriş icazəsi verin"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Bu tətbiqə bu cihazda və ya qoşulmuş cihazların yaddaşındakı bütün faylları oxumaq, dəyişmək və silmək icazəsi verin. İcazə verilsə, tətbiq xəbəriniz olmadan fayllara daxil ola bilər."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Bütün fayllara daxil ola bilər"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reallıq dinləyici stereo köməkçi xidməti"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Tətbiqlər üzərindən görüntüləmə"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Digər tətbiqlərin üzərindən görüntülənən <xliff:g id="COUNT_1">%2$d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%1$d</xliff:g> tətbiq"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a92be39..7accba5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja skladišta akreditiva"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Administrator je onemogućio"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nije dostupno"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Bezbednosni status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
@@ -374,7 +374,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uvek zahtevaj potvrdu pri korišćenju otključavanja licem u aplikacijama"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Briši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Podesite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Otključajte uređaj, prijavite se u aplikaciju i potvrdite plaćanje pomoću otključavanja licem.\n\nImajte u vidu:\nAko pogledate telefon, možete nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu dok su vam oči otvorene.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Otključajte uređaj, prijavite se u aplikaciju i potvrdite plaćanje pomoću otključavanja licem.\n\nImajte u vidu:\nAko pogledate telefon, možete nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Otključajte uređaj, prijavite se u aplikaciju i potvrdite plaćanje pomoću otključavanja licem.\n\nImajte u vidu:\nAko pogledate telefon, možete nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu čak i ako su vam oči zatvorene.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Brišete podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje koristi otključavanje licem biće trajno i bezbedno izbrisani. Posle uklanjanja trebaće vam PIN, obrazac ili lozinka da biste otključali telefon, prijavljivali se u aplikacije i potvrđivali plaćanja."</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonimni identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Lozinka"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikator SAE lozinke"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Prikaži lozinku"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Izaberite opseg pristupne tačke"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatski"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deli se Wi‑Fi sa ovim uređajem…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezuje se…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Delite hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potvrdite da ste to vi"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potvrdite svoj identitet"</string>
     <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" msgid="1707702705345670370">"Dozvolite povezivanje sa ovom mrežom kada je uređaj 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">"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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikada se ne isključuje automatski"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Isključuje se automatski kada sunce izađe"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tamna tema koristi crnu boju da bi baterija trajala duže. Rasporedi tamne teme se ne uključuju dok se ekran ne isključi."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tamna tema koristi crnu pozadinu da bi baterija trajala duže na nekim ekranima. Rasporedi tamne teme se ne uključuju dok se ekran ne isključi."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Gašenje ekrana"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Podesite PIN da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Podesite šablon iz bezbednosnih razloga"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ponovo unesite lozinku"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Unesite lozinku profila za Work"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potvrdite šablon"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Unesite šablon profila za Work"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ponovo unesite PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Unesite PIN profila za Work"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Lozinke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Ponovo nacrtajte šablon"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Čitač ekrana prvenstveno namenjen slepim i slabovidim osobama"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Dodirnite stavke na ekranu da biste ih čuli"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Uvećanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast za uvećanje"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Pregledajte kontroler pomeranja"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Prikaz kontrolera poput džojstika za pomeranje oblasti za uvećanje"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Podešavanja uvećanja"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Uvećavajte pomoću prečice i trostrukog dodira"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"O funkciji Uvećanje"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcije"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Uvećajte prikaz na ekranu"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Dodirnite 3 puta da biste zumirali"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite dugme da biste zumirali"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Izaberite SIM karticu"</string>
     <string name="color_orange" msgid="216547825489739010">"Narandžasta"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ljubičasta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Roze"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nije ubačena nijedna SIM kartica"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status SIM kartice"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status SIM kartice (otvor za SIM: %1$d)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> je omogućeno</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključite režim Ne uznemiravaj"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Izuzeci"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiraj vizuelna ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dozvoli vizuelne signale"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kada je uključen režim Ne uznemiravaj"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Omogućite prekide koji proizvode zvuk"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ograničite obaveštenja"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bez zvučnog signala za obaveštenja"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Videćete obaveštenja na ekranu"</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Isključi zvuk uređaja ali dozvoli izuzetke"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Izuzeci"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Raspored"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Pogledajte sve izuzetke"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Izuzeci kada je uključen režim Ne uznemiravaj"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Ljudi"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmi i drugi prekidi"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Rasporedi"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Obaveštenja za koje je isključen zvuk"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kada je uključen režim Ne uznemiravaj, zvuk i vibracija biće isključeni, osim za stavke koje ste dozvolili iznad."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Isključi zvuk za sve osim za:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Zvuk je isključen"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Konverzacije"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Dozvoli poruke"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Da biste bili sigurni da će se dozvoljene poruke čuti, proverite da li je uređaj podešen da zvoni, vibrira ili je u nečujnom režimu."</string>
     <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 da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju."</string>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ni od koga"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne dozvoli pozive"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne dozvoljavaj nikakve poruke"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Dozvoli alarme"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Obaveštenja tajmera, alarma, bezbednosnih sistema i drugih aplikacija"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmi"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Puštaj medijske zvuke"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvukovi medija"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Obaveštenja video snimaka, igara i drugih medija"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"mediji"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Dozvoli zvukove pri dodiru"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvukovi pri dodiru"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Obaveštenja tastature i druge dugmadi"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvukovi pri dodiru"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Dozvoli podsetnike"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Podsetnici"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Obaveštenja o zadacima i podsetnicima"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"podsetnici"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Dozvoli događaje"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Događaji"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Obaveštenja o predstojećim događajima iz kalendara"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dozvoli da aplikacije zanemaruju"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Izuzeci za aplikacije"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Prikaz preko drugih aplikacija"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Dozvoli prikaz preko drugih aplikacija"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Omogućite ovoj aplikaciji da se prikazuje preko drugih aplikacija koje koristite. To može da ometa korišćenje tih aplikacija ili da promeni njihov izgled ili ponašanje."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Pristup svim datotekama"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Dozvoli pristup za upravljanje svim datotekama"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Dozvolite da ova aplikacija čita, menja i briše sve datoteke na ovom uređaju ili svim povezanim uređajima za skladištenje. Ako to dozvolite, aplikacija može da pristupa datotekama bez vašeg znanja."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Može da pristupa svim datotekama"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuelna realnost obrađivač usluga stereo pomagača"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Aplikacije sa dozvolom za prikaz preko drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9123a04..721693c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Устанавіць маё месцазнаходжанне, разблакаванне экрана, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Прыватнасць"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Адключана адміністратарам"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Недаступна"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Стан бяспекі"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блакіроўка экрана, распазнаванне твару"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блакіроўка экрана, адбітак пальца"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Пры распазнаванні твару ў праграмах патрабуецца этап пацвярджэння"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Выдаліць даныя твару"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Наладзьце распазнаванне твару"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Выкарыстоўвайце функцыю распазнавання твару, каб разблакіраваць прыладу, уваходзіць у праграмы і пацвярджаць плацяжы.\n\nМайце на ўвазе:\nГледзячы на тэлефон, вы можаце разблакіраваць яго, нават калі не маеце такога намеру.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару, калі ў вас расплюшчаны вочы.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Выкарыстоўвайце функцыю распазнавання твару, каб разблакіраваць прыладу, уваходзіць у праграмы і пацвярджаць плацяжы.\n\nМайце на ўвазе:\nГледзячы на тэлефон, вы можаце разблакіраваць яго, нават калі не маеце такога намеру.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Выкарыстоўвайце функцыю распазнавання твару, каб разблакіраваць прыладу, уваходзіць у праграмы і пацвярджаць плацяжы.\n\nМайце на ўвазе:\nВы можаце ненаўмысна разблакіраваць тэлефон, проста гледзячы на экран.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару, нават калі ў вас заплюшчаны вочы.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Выдаліць даныя пра твар?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Даныя твару, якія выкарыстоўваюцца функцыяй распазнавання твару, будуць бяспечна выдалены. Пасля выдалення для разблакіроўкі тэлефона, уваходу ў праграмы і пацвярджэння плацяжоў трэба выкарыстоўваць PIN-код, узор разблакіроўкі ці пароль."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Ідэнтыфікатар"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Ананімны ідэнтыфікатар"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Пароль"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Ідэнтыфікатар пароля SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Паказваць пароль"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Выбраць дыяпазон для пунктаў доступу"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Аўтаматычна"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi абагульваецца з гэтай прыладай…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Ідзе падключэнне…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Абагульванне хот-спота"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Пацвердзіце, што гэта вы"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Пацвердзіце, што гэта вы"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Уключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ніколі не выключыцца аўтаматычна"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Выключыцца аўтаматычна на ўсходзе сонца"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"У цёмнай тэме выкарыстоўваецца чорны фон, які эканоміць узровень зараду акумулятара. Акрамя таго, вы можаце вызначыць, калі цёмная тэма павінна ўключацца і выключацца."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"У цёмнай тэме на некаторых экранах выкарыстоўваецца чорны фон, які эканоміць узровень зараду акумулятара. Калі вы будзеце карыстацца тэлефонам у момант запланаванага ўключэння цёмнай тэмы, яна актывуецца пасля выключэння экрана."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Час чакання экрана"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Экран выключаецца"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Задайце PIN-код для выкарыстання адбітка"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Задайце ўзор разблакіроўкі, каб абараніць прыладу"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Увядзіце пароль яшчэ раз"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Увядзіце пароль працоўнага профілю"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Пацвердзіце ўзор"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Увядзіце ўзор разблакіроўкі"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Увядзіце PIN-код яшчэ раз"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Увядзіце PIN-код працоўнага профілю"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Паролі не супадаюць"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-коды не супадаюць"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Нарысуйце ўзор разблакіроўкі яшчэ раз"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Праграма для чытання з экрана прызначана ў першую чаргу для сляпых людзей і людзей са слабым зрокам"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Дакранайцеся да элементаў на экране, каб пачуць, як іх чытаюць услых"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налады субцітраў"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Павелічэнне"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Павялічыць"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Вобласць павелічэння"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Паказваць кантролер перамяшчэння"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Паказваць падобны да джойсціка кантролер для перамяшчэння вобласці павелічэння"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Налады павелічэння"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Павялічваць спалучэннем клавіш і трайным дотыкам"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Інфармацыя пра павелічэнне"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Параметры"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Павялічыць маштаб экрана"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Тройчы дакраніцеся, каб змяніць маштаб"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Дакраніцеся да кнопкі, каб павялічыць маштаб"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Выбраць SIM-карту"</string>
     <string name="color_orange" msgid="216547825489739010">"Аранжавы"</string>
     <string name="color_purple" msgid="6603701972079904843">"Фіялетавы"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ружовы"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Няма ўстаўленых SIM-карт"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Статус SIM-карты"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Стан SIM-карты (слот для SIM-карты %1$d)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="other">Уключана: <xliff:g id="ON_COUNT">%d</xliff:g></item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Уключэнне рэжыму \"Не турбаваць\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Выключэнні"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блакіроўка візуальных апавяшчэнняў"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дазволіць візуальныя сігналы"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Калі рэжым \"Не турбаваць\" уключаны"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Дазволіць перарыванні з гукам"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Абмежаваць апавяшчэнні"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Апавяшчэнні без гуку"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Апавяшчэнні будуць паказвацца на экране"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Адключыць гук прылады, аднак дазволіць выключэнні з правілаў"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Выключэнні"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Расклад"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Паказаць усе выключэнні з правіла"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Калі рэжым \"Не турбаваць\" уключаны"</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_schedule" msgid="2003707171924226212">"Расклады"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Апавяшчэнні без гуку"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Калі ўключаны рэжым \"Не турбаваць\", выключаюцца гук і вібрацыя для ўсіх элементаў, акрамя выбраных вамі вышэй."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Выключыць гук для ўсяго, акрамя"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Без гуку"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Размовы"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Дазволіць паведамленні"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Каб прылада апавяшчала аб дазволеных паведамленнях гукам, праверце, як яна наладжана: на званок, вібрацыю або бязгучны рэжым."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Для раскладу \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" прыём уваходных паведамленняў заблакіраваны. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязвацца з вамі."</string>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ні ад каго"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Не дазваляць выклікаў"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Не дазваляць паведамленні"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Дазволіць будзільнікі"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Будзільнікі"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Ад таймераў, будзільнікаў, сістэм бяспекі і іншых праграм"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"будзільнікі"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Прайграваць гукі мультымедыя"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Гукі мультымедыя"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Ад відэа, гульняў і іншых мультымедыя"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"мультымедыя"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Дазволіць гукі пры дотыку"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Гукі пры дотыку"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Ад клавіятуры і іншых кнопак"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"гукі пры дотыку"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Дазволіць напаміны"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Напаміны"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Ад задач і напамінаў"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"напаміны"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Дазволіць падзеі"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Падзеі"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Ад падзей календара, якія павінны адбыцца"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дазволіць праграмам перавызначаць"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Выключэнні з правілаў для праграм"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Паказваць паверх іншых праграм"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Дазволіць паказ паверх іншых праграм"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Дазволіць гэтай праграме паказвацца паверх іншых праграм, якія вы выкарыстоўваеце. Гэта можа перашкодзіць выкарыстанню гэтых праграм або змяніць спосаб, якім яны могуць паказвацца або працаваць."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Доступ да ўсіх файлаў"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Дазволіць доступ да кіравання ўсімі файламі"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Дазвольце гэтай праграме счытваць, змяняць і выдаляць усе файлы на гэтай прыладзе ці ў падключаных сховішчах. З такім дазволам праграма зможа атрымліваць доступ да файлаў без вашага ведама."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Магчымы доступ да ўсіх файлаў"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr віртуальная рэальнасць сродак праслухоўвання стэрэа служба-памочнік"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Паказваць паверх іншых праграм"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g> праграм(-ы) дазволена паказвацца паверх іншых праграм"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a4a543a..9d273ed 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Поверителност"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Деактивирано от администратора"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Не е налице"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Състояние на сигурността"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заключване на екрана, отключване с лице"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Опция за заключване на екрана, отпечатък"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"При отключване с лице в приложенията винаги да се изисква потвърждение"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Изтриване на лицата"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Настройване на отключването с лице"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Използвайте „Отключване с лице“, за да отключвате устройството си, да влизате в профила си в приложения и да потвърждавате плащания.\n\nИмайте предвид следното:\nМожете да отключите телефона неволно, като го погледнете.\n\nТелефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви, докато очите ви са отворени.\n\nТой би могъл да бъде отключен и от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Използвайте „Отключване с лице“, за да отключвате устройството си, да влизате в профила си в приложения и да потвърждавате плащания.\n\nИмайте предвид следното:\nМожете да отключите телефона неволно, като го погледнете.\n\nТелефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви.\n\nТой би могъл да бъде отключен и от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Използвайте „Отключване с лице“, за да отключвате устройството си, да влизате в профила си в приложения и да потвърждавате плащания.\n\nИмайте предвид следното:\nМожете да отключите телефона неволно, като го погледнете.\n\nТелефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви дори ако очите ви са затворени.\n\nТой би могъл да бъде отключен и от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Да се изтрият ли данните за лицето?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Използваните от функцията за отключване с лице данни за лицето ще бъдат изтрити надеждно и за постоянно. След премахването ще имате нужда от ПИН кода, фигурата или паролата си, за да отключвате телефона си, да влизате в приложения и да потвърждавате плащания."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Самоличност"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Анонимна самоличност"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Парола"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Идентификатор на парола за SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Показване на паролата"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Избиране на честота на точката за достъп"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автоматично"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi-Fi мрежата се споделя с това устройство…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Свързва се…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Споделяне на точката за достъп"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Потвърдете, че сте вие"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Потвърдете, че това сте вие"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Вкл./<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Няма да се изключва автоматично"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ще се изключва автоматично при изгрев"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Тъмната тема използва реалистично ниво на черното с цел удължаване на живота на батерията ви. Графиците за нея изчакват с включването, докато екранът ви не се изключи."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Тъмната тема използва черен фон с цел удължаване на живота на батерията на някои екрани. Графиците за нея изчакват с включването, докато екранът ви не се изключи."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Време за изчакване на екрана"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Екранът се изключва"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Задайте ПИН, за да ползвате отпечатък"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"От съображения за сигурност задайте фигура"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Въведете отново паролата си"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Въведете служебната си парола"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Потвърдете фигурата си"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Въведете служебната си фигура"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Въведете отново ПИН кода си"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Въведете служебния си ПИН код"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Паролите не си съответстват"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ПИН кодовете не са идентични"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Начертайте отново фигурата си"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Екранен четец, предимно за хора със слепота и слабо зрение"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Докоснете елементи на екрана си, за да ги чуете прочетени на глас"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Предпочитания за надписите"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ниво на мащаба"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Увеличение"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увеличаване"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Контролер за преместване: Показване"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Показване на контролер (тип джойстик), с който да изберете областта за увеличаване"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Настройки за увеличаването"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Увелич. на мащаба с пряк път и трикратно докосване"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Всичко за увеличението"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Опции"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Мащаб на екрана: Увелич."</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Трикратно докосване за промяна на мащаба"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Променяйте мащаба с докосване на бутон"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Избиране на SIM карта"</string>
     <string name="color_orange" msgid="216547825489739010">"оранжево"</string>
     <string name="color_purple" msgid="6603701972079904843">"лилаво"</string>
+    <string name="color_pink" msgid="8596872110888626708">"розово"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Няма поставени SIM карти"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Състояние на SIM картата"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Съст. на SIM картата (слот %1$d за SIM)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">Активирахте 1</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Включване на режима „Не безпокойте“"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Изключения"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Виз. предупрежд.: Блокиране"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуални сигнали: Разрешаване"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Когато режимът „Не безпокойте“ е включен"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Разрешаване на звуковите прекъсвания"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Огран. на известията"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Без звук от известията"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Ще виждате известия на екрана си"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> графика могат да се включват автоматично</item>
       <item quantity="one">1 график може да се включва автоматично</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Спиране на звука на устройството, но разрешаване на изключенията"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Изключения"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"График"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Вижте всички изключения"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Изключения, когато режимът „Не безпокойте“ е включен"</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_schedule" msgid="2003707171924226212">"Графици"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Заглушени известия"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Когато режимът „Не безпокойте“ е включен, звуците и вибрирането ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Спиране на звука за всичко освен за"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Звукът е спрян"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Още <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">Още 1</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Разговори"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Разрешаване на съобщения"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"За да е сигурно, че за разрешените съобщения се възпроизвежда звук, проверете дали за устройството ви е зададено звънене, вибриране, или тих режим."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Входящите съобщения са блокирани за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да коригирате настройките, за да разрешите на близки, приятели и други контакти да се свързват с вас."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Никакви"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Забраняване на всички обаждания"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Забраняване на всички съобщения"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Разрешаване на будилници"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Будилници"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"От таймери, будилници, охранителни системи и други приложения"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"будилници"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Възпроизвеждане на звуците от мултимедия"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Звуци от мултимедийно съдържание"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"От видеоклипове, игри и друго мултимедийно съдържание"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"мултимедия"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Разрешаване на звуци при докосване"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Звуци при докосване"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"От клавиатурата ви и други бутони"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"звуци при докосване"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Разрешаване на напомняния"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Напомняния"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"От задачи и напомняния"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"напомняния"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Разрешаване на събития"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Събития"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"От предстоящи събития в календара"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешаване на приложения да отменят режима"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Изключения за приложения"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Показване върху други приложения"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Разрешаване на показв. върху други приложения"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Разрешава на приложението да се показва върху другите използвани от вас приложения. Това може да възпрепятства работата ви с тях или да промени поведението им или начина, по който ги виждате."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Достъп до всички файлове"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Разрешете достъп за управл. на всички файлове"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Разрешете на това приложение да чете, променя и изтрива всички файлове на устройството или обемите на свързаните хранилища. Ако то получи разрешението, може да осъществява достъп до файловете без изричното ви знание."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Може да осъществява достъп до всички файлове"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуална реалност приемател стерео помощна услуга"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Показв. върху други приложения"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> от <xliff:g id="COUNT_1">%2$d</xliff:g> приложения имат разрешение да се показват върху други"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0d43287..fd80620 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"আমার স্থান, স্ক্রিন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"আমার স্থান, স্ক্রিন আনলক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"গোপনীয়তা"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"উপলভ্য নয়"</string>
     <string name="security_status_title" msgid="6958004275337618656">"নিরাপত্তা স্ট্যাটাস"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্রিন লক, মুখের সাহায্যে আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্রিন লক, আঙ্গুলের ছাপ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"অ্যাপে \"মুখের সাহায্যে আনলক\" ব্যবহারের সময়ে প্রতিবার কনফার্ম করতে হবে"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ফেস ডেটা মুছে ফেলুন"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ফেসের সাহায্যে আনলক সেট-আপ করুন"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"আপনার ডিভাইস আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে মুখের সাহায্যে আনলক করার সুবিধাটি ব্যবহার করুন। \n\nমনে রাখবেন:\nআপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে।\n\nআপনার চোখ খোলা থাকা অবস্থায় অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারবেন।\n\nআপনার মতো দেখতে এমন যে কেউ; যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারবেন।"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"আপনার ডিভাইস আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে মুখের সাহায্যে আনলক করার সুবিধাটি ব্যবহার করুন। \n\nমনে রাখবেন:\nআপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে।\n\nআপনার চোখ খোলা থাকা অবস্থায় অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারবেন।\n\nআপনার মতো দেখতে এমন যে কেউ; যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারবেন।"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"আপনার ডিভাইস আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে মুখের সাহায্যে আনলক করার সুবিধাটি ব্যবহার করুন।\n\nমনে রাখবেন:\nআপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে।\n\nআপনার চোখ বন্ধ অবস্থায় থাকলেও অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারেন।\n\nআপনার মতো অনেকটা দেখতে এমন যে কেউ; যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারেন।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"মুখ শনাক্তকরণ ডেটা মুছে ফেলতে চান?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'মুখের সাহায্যে আনলক\' ফিচারটি মুখ সংক্রান্ত যে ডেটা ব্যবহার করেছে তা স্থায়ীভাবে এবং নিরাপদে মুছে ফেলা হবে। সরানো হয়ে গেলে, ফোন আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে আপনার পিন, প্যাটার্ন অথবা পাসওয়ার্ডের প্রয়োজন হবে।"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"পরিচয়"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"নামহীন পরিচয়"</string>
     <string name="wifi_password" msgid="1458802324849513755">"পাসওয়ার্ড"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE পাসওয়ার্ড শনাক্তকারী"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"পাসওয়ার্ড দেখুন"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ব্যান্ড বেছে নিন"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"অটোমেটিক"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"এই ডিভাইসটি ওয়াই-ফাই-এর সাথে কানেক্ট করা আছে…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"কানেক্ট হচ্ছে…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"হটস্পট শেয়ার করুন"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"আপনার পরিচয় যাচাই করুন"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"এটি যে আপনি তা যাচাই করুন"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"চালু / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"কখনই নিজে থেকে বন্ধ হবে না"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"সূর্যোদয়ের সময় নিজে থেকে বন্ধ হবে"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"\'গাঢ় থিম\' ফিচারটি একদম কালো রঙ ব্যবহার করে যাতে আপনার ব্যাটারি অনেক্ষণ চলতে পারে। স্ক্রিন বন্ধ না হওয়া পর্যন্ত গাঢ় থিমের সময়সূচি চালু হওয়ার জন্য অপেক্ষা করে।"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ব্যাটারি যাতে অনেক্ষণ চলতে পারে সেই জন্য গাঢ় থিম কিছু স্ক্রিনে কালো রঙয়ের ব্যাকগ্রাউন্ড ব্যবহার করে। গাঢ় থিমের সময়সূচি আপনার স্ক্রিনটি বন্ধ না হওয়া পর্যন্ত চালু হওয়ার জন্য অপেক্ষা করে।"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"স্ক্রিন টাইম-আউট"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"স্ক্রিন বন্ধ হয়"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পিন সেট করুন"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"নিরাপত্তার জন্য, প্যাটার্ন সেট করুন"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"আপনার পাসওয়ার্ডটি আবার লিখুন"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"আপনার অফিসের পাসওয়ার্ড লিখুন"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"আপনার প্যাটার্ন নিশ্চিত করুন"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"আপনার অফিসের প্যাটার্ন লিখুন"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"আপনার পিনটি আবার লিখুন"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"আপনার পিনটি লিখুন"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"পাসওয়ার্ডগুলি মিলছে না"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"পিন মিলছে না"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"আবার প্যাটার্ন আঁকুন"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"স্ক্রিন রিডার প্রাথমিকভাবে অন্ধত্ব এবং কম দৃষ্টি সম্পন্ন ব্যক্তিদের জন্য"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"স্ক্রিনের আইটেমগুলিতে আলতো চাপ দিলে সেগুলি উচ্চারণ করে শোনানো হবে"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ক্যাপশন অভিরুচি"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বড় করে দেখা"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"বড় করুন"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বড় করার জায়গা"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"মুভ কন্ট্রোলার দেখুন"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"যে জায়গাটি বড় করা হয়েছে সেটি সরানোর জন্য জয়স্টিকের মতো কন্ট্রোলার দেখুন"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"বড় করার সেটিংস"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"শর্টকাটের মাধ্যমে ও তিনবার ট্যাপ করে বড় করুন"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"বড় করে দেখা সম্পর্কে"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"বিকল্প"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"স্ক্রিনে জুম বাড়ান"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"জুম করতে ৩ বার ট্যাপ করুন"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"জুম করার জন্য বোতামে ট্যাপ করুন"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"সিম কার্ড বেছে নিন"</string>
     <string name="color_orange" msgid="216547825489739010">"কমলা"</string>
     <string name="color_purple" msgid="6603701972079904843">"বেগুনী"</string>
+    <string name="color_pink" msgid="8596872110888626708">"গোলাপী"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"কোনো সিম কার্ড ঢোকানো নেই"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"সিম-এর স্ট্যাটাস"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"সিম স্ট্যাটাস (সিম স্লট %1$d)"</string>
@@ -3246,6 +3253,8 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি চালু করা আছে</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"বিরক্ত করবে না"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বিরক্তিকর কন্টেন্ট বন্ধ করা"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'বিরক্ত করবে না\' মোড চালু করুন"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ব্যতিক্রম"</string>
@@ -3272,7 +3281,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ভিজ্যুয়াল ব্যাঘাতগুলিকে ব্লক করুন"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ভিজুয়াল সঙ্কেতগুলি চালু করুন"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"যখন \'বিরক্ত করবে না চালু\' থাকবে"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"বিজ্ঞপ্তি ব্লক করুন"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"আপনার স্ক্রিনে বিজ্ঞপ্তি দেখতে পাবেন"</string>
@@ -3333,10 +3343,18 @@
       <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_category_behavior" msgid="4456460102057665854">"ডিভাইস মিউট করুন কিন্তু কিছু ক্ষেত্রে সাউন্ডের অনুমতি দিন"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ব্যতিক্রম"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"সময় ঠিক করুন"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"সবগুলি দেখুন"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"\'বিরক্ত করবে না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সবকিছুর ক্ষেত্রে সাউন্ড এবং ভাইব্রেশন মিউট করা হবে।"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"এগুলি ছাড়া সবকিছু মিউট করুন"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"মিউট করা আছে"</string>
@@ -3596,6 +3614,8 @@
       <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>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"মেসেজের অনুমতি দিন"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"আপনার ডিভাইসে অনুমতি দেওয়া আছে এমন নম্বর থেকে মেসেজ এলে রিং বাজবে কিনা নিশ্চিত করতে সেটি রিং, ভাইব্রেশন অথবা মিউট মোডে আছে কিনা দেখে নিন।"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-এর জন্য ইনকামিং মেসেজ ব্লক করা হয়েছে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
@@ -3609,15 +3629,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"কলের অনুমতি দেবেন না"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"কোনও মেসেজের অনুমতি নেই"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"অ্যালার্ম বাজার অনুমতি দিন"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"অ্যালার্মগুলি"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"অ্যালার্ম"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"মিডিয়া সাউন্ড চালান"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"মিডিয়া"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"টাচ সাউন্ডের অনুমতি দিন"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"টাচ সাউন্ড"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"টাচ সাউন্ড"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"রিমাইন্ডারের অনুমতি দিন"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"রিমাইন্ডার"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"রিমাইন্ডার"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ইভেন্টের অনুমতি দিন"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ইভেন্টগুলি"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"অ্যাপ ওভাররাইডের অনুমতি দিন"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"অ্যাপ এক্সেপশন"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3744,7 +3775,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"সমস্ত অ্যাপ্লিকেশন"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"ইনস্টল করা অ্যাপগুলি"</string>
-    <string name="filter_instant_apps" msgid="2292108467020380068">"ঝটপট অ্যাপ"</string>
+    <string name="filter_instant_apps" msgid="2292108467020380068">"ইনস্ট্যান্ট অ্যাপ"</string>
     <string name="filter_notif_all_apps" msgid="2764590815789208306">"অ্যাপ: সমস্ত"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"বন্ধ করা আছে"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"বিভাগগুলি: জরুরী গুরুত্বের"</string>
@@ -3913,6 +3944,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"অন্য অ্যাপের উপরে দেখুন"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"অন্য অ্যাপের উপর প্রদর্শিত হওয়ার অনুমতি দিন"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"আপনি অন্য যে সমস্ত অ্যাপ ব্যবহার করছেন, সেগুলির উপরে এই অ্যাপটিকে প্রদর্শিত হওয়ার অনুমতি দিন। এর ফলে বাকি অ্যাপগুলি ব্যবহারে ব্যাঘাত ঘটতে পারে এবং স্ক্রিনে সেগুলির উপস্থিতি অথবা আচরণে পরিবর্তন হতে পারে।"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"সব ফাইলে অ্যাক্সেস"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"সব ফাইল ম্যানেজ করতে অ্যাক্সেস দিন"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"এই ডিভাইস অথবা এতে কানেক্ট রয়েছে এমন যেকোনও স্টোরেজের ভলিউমে থাকা সব ফাইল পড়তে, পরিবর্তন করতে এবং মুছতে এই অ্যাপকে অনুমতি দিন। অনুমতি দিলে এই অ্যাপ আপনাকে না জানিয়েই ফাইলগুলি অ্যাক্সেস করতে পারবে।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"সব ফাইল অ্যাক্সেস করতে পারে"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"ভার্চুয়াল রিয়েলিটিVR লিসনার স্টিরিও সহায়তাকারী পরিষেবা"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"অন্য অ্যাপের উপরে দেখুন"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি অ্যাপকে বাকিগুলির উপরে দেখতে পাওয়া যাবে"</string>
@@ -4389,7 +4424,7 @@
     <string name="storage_manager_indicator" msgid="6187509172735927297">"স্টোরেজ ম্যানেজার: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="2705959642617709265">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="8380330763647785309">"চালু আছে"</string>
-    <string name="install_type_instant" msgid="7685381859060486009">"ঝটপট অ্যাপ"</string>
+    <string name="install_type_instant" msgid="7685381859060486009">"ইনস্ট্যান্ট অ্যাপ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"স্টোরেজ ম্যানেজার বন্ধ করবেন?"</string>
     <string name="storage_movies_tv" msgid="7897612625450668593">"সিনেমা ও টিভি অ্যাপ"</string>
     <string name="carrier_provisioning" msgid="7217868336140325816">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 49782d4..73f3085 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje pohrane akreditiva"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Onemogućio administrator"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nije dostupno"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sigurnosni status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
@@ -374,8 +374,8 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kod otključavanja licem za aplikacije, uvijek tražite potvrdu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Izbriši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Postavite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati čak i kada vam to nije namjera ako pogledate u njega.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu dok su vam oči otvorene.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je naprimjer identični blizanac."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati čak i kada vam to nije namjera ako pogledate u njega.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu čak i dok su vam oči zatvorene.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je naprimjer identični blizanac."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati ako pogledate u njega čak i kada vam to nije namjera.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je naprimjer identični blizanac."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati ako pogledate u njega čak i kada vam to nije namjera.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu čak i dok su vam oči zatvorene.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je naprimjer identični blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Izbrisati podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje je koristila funkcija otključavanja licem će se trajno i sigurno izbrisati. Nakon uklanjanja, trebat će vam PIN, uzorak ili lozinka za otključavanje telefona, prijavu u aplikacije i potvrdu plaćanja."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Otključajte telefon pomoću funkcije Otključavanje licem"</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonimni identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Lozinka"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikator lozinke za SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Prikaži lozinku"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Odaberite opseg pristupne tačke"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatski"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Dijeljenje WiFi mreže s ovim uređajem…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezivanje…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Dijeljenje pristupne tačke"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potvrdite da ste to vi"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potvrdite svoj identitet"</string>
     <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" msgid="1707702705345670370">"Dozvolite povezivanje s ovom mrežom kada 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 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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Neće se nikada automatski isključiti"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Automatski će se isključiti u svitanje"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tamna tema koristi crnu boju da bi se trajanje baterije produžilo. Tamna tema zakazuje čekanje uključivanja dok se ekran ne isključi."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tamna tema koristi crnu pozadinu da bi se trajanje baterije produžilo na nekim ekranima. Tamna tema zakazuje čekanje uključivanja dok se ekran ne isključi."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Istek vremena ekrana"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Da koristite otisak prsta, postavite PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Postavite uzorak radi sigurnosti"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ponovo unesite lozinku"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Unesite radnu lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potvrdite uzorak"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Unesite radni uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ponovo unesite PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Unesite radni PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Lozinke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Ponovo nacrtajte uzorak"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Čitač ekrana prvenstveno za slijepe i slabovidne osobe"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Dodirnite stavke na ekranu da se naglas pročitaju"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Uvećavanje"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Uvećavanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje uvećavanja"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Prikaz kontrolera za pomjeranje"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Prikaz kontrolera nalik džojstiku za pomjeranje područja uvećavanja"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Postavke uvećavanja"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Uvećajte pomoću prečice i trostrukog dodira"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"O funkciji Uvećavanje"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcije"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Uvećajte prikaz na ekranu"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Dodirnite tri puta da zumirate"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite dugme da zumirate"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Odaberite SIM karticu"</string>
     <string name="color_orange" msgid="216547825489739010">"Narandžasta"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ljubičasta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ružičasta"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM kartica nije umetnuta"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status SIM-a"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status SIM-a (utor za sim %1$d)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravila je omogućeno</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključi način rada Ne ometaj"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Izuzeci"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizuelnih ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dozvolite vizualnu signalizaciju"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kada je uključen način rada Ne ometaj"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Dozvoli ometanja koja proizvode zvuk"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ograničite obavještenja"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Obavještenja bez zvuka"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Obavještenja ćete vidjeti na ekranu"</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Isključi zvuk uređaja, ali dozvoli izuzetke"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Izuzeci"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Raspored"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Pogledajte sve izuzetke"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Izuzeci kada je uključen način rada Ne ometaj"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmi i druga ometanja"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Rasporedi"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Utišana obavještenja"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kada je uključen način rada Ne ometaj, zvuk i vibracija će biti isključeni, osim za stavke koje omogućite iznad."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Isključi zvuk za sve osim"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Isključen zvuk"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Razgovori"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Dozvoli poruke"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Da budete sigurni da čujete dozvoljene dolazne poruke, provjerite je li vaš uređaj postavljen da zvoni, vibrira ili je u tihom načinu."</string>
     <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>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ništa"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Zabrani sve pozive"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Zabrani sve poruke"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Dozvoli alarme"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Obavještenja tajmera, alarma, sigurnosnih sistema i drugih aplikacija"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmi"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproduciraj zvukove medija"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvukovi medija"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Obavještenja videozapisa, igara i drugih medija"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"mediji"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Dozvoli zvukove dodira"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvuci dodira"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Obavještenja tastature i drugih dugmadi"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvuci dodira"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Dozvoli podsjetnike"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Podsjetnici"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Obavještenja o zadacima i podsjetnicima"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"podsjetnici"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Dozvoli događaje"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Događaji"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Obavještenja nadolazećih događaja iz kalendara"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dozvolite aplikacijama da zanemaruju"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Izuzeci za aplikacije"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3761,7 +3777,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otvori bez pitanja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podržani linkovi"</string>
     <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ostale zadane vrijednosti"</string>
-    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> se koristi u memoriji <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: iskorišteno <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="8072987826282477558">"Unutrašnja pohrana"</string>
     <string name="storage_type_external" msgid="8258689891893683905">"Vanjska pohrana"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"Iskorišt.: <xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Prikaz preko drugih aplikacija"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Dozvoli prikaz preko drugih aplikacija"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Dozvolite ovoj aplikaciji da prekrije ostale aplikacije koje koristite. Može vas ometati u korištenju tih aplikacija ili promijeniti način na koji se one prikazuju ili ponašaju."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Pristup svim fajlovima"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Dozvoli pristup za upravljanje svim fajlovima"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Dozvolite ovoj aplikaciji da čita, mijenja i briše sve fajlove na ovom uređaju ili svim povezanim uređajima za pohranu. Ako to dozvolite, aplikacija može pristupati fajlovima bez vašeg znanja."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Može da pristupa svim fajlovima"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr slušalac virtuelne realnosti stereo pomoćna usluga"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Aplikacije s odobrenjem za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4e607b4..f43614c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privadesa"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Desactivada per l\'administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"No disponible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estat de seguretat"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueig de pantalla, desbloqueig facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueig de pantalla, empremta digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sol·licita confirmació en utilitzar el desbloqueig facial en aplicacions"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Suprimeix dades facials"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configura el desbloqueig facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Utilitza el desbloqueig facial per desbloquejar el teu dispositiu, iniciar la sessió a les aplicacions i confirmar els pagaments.\n\nTingues en compte el següent:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara i tens els ulls oberts.\n\nÉs possible que algú que s\'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilitza el desbloqueig facial per desbloquejar el teu dispositiu, iniciar la sessió a les aplicacions i confirmar els pagaments.\n\nTingues en compte el següent:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara.\n\nÉs possible que algú que s\'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilitza el desbloqueig facial per desbloquejar el teu dispositiu, iniciar la sessió a les aplicacions i confirmar els pagaments.\n\nTingues en compte el següent:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara, encara que tinguis els ulls tancats.\n\nÉs possible que algú que s\'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vols suprimir les dades facials?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les dades facials utilitzades pel desbloqueig facial se suprimiran permanentment i de manera segura. Un cop suprimides, necessitaràs el PIN, el patró o la contrasenya per desbloquejar el telèfon, iniciar la sessió a les aplicacions i confirmar pagaments."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitat"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identitat anònima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Contrasenya"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador de password SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostra la contrasenya"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Selecciona la banda del punt d\'accés"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automàtica"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"S\'està compartint la Wi‑Fi amb aquest dispositiu…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"S\'està connectant…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Comparteix el punt d\'accés Wi‑Fi"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifica que ets tu"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifica que ets tu"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"No es desactivarà mai automàticament"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Es desactivarà automàticament a l\'alba"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"El tema fosc utilitza el negre real perquè la bateria duri més. Les programacions del tema fosc no s\'activen fins que la pantalla està desactivada."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"El tema fosc utilitza un fons negre en algunes pantalles perquè la bateria duri més. Les programacions del tema fosc no s\'activen fins que la pantalla està desactivada."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Temps d\'espera de la pantalla"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Per utilitzar l\'empremta, defineix un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Per motius de seguretat, cal que defineixis un patró"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Torna a introduir la contrasenya"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Introdueix la contrasenya de la feina"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirma el patró"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Introdueix el patró de la feina"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Torna a introduir el PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Introdueix el PIN de la feina"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Les contrasenyes no coincideixen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Els codis PIN no coincideixen"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Torna a dibuixar el patró"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinat principalment a persones invidents i amb problemes de visió"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca els elements de la pantalla per sentir-los en veu alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Amplia"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Àrea d\'ampliació"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostra el comandament de moviments"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostra un comandament semblant a una palanca de control per moure l\'àrea d\'ampliació"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Opcions de configuració d\'ampliació"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Amplia amb una drecera i tres tocs"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Sobre l\'ampliació"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcions"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Amplia la pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Toca tres cops per fer zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botó per fer zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selecciona una targeta SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Taronja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Porpra"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No s\'ha inserit cap targeta SIM."</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Estat de la SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Estat de la SIM (ranura de la SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">S\'ha activat 1 programació</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestis"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Rebre notificacions només de persones i aplicacions importants"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Restringeix les interrupcions"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activa el mode No molestis"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Excepcions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloqueja interrupcions visuals"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permet senyals visuals"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quan està activat el mode No molestis"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permet les interrupcions que reprodueixen algun so"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringeix les notificacions"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificacions sense so"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Veuràs notificacions a la pantalla"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Silencia el dispositiu, però permet excepcions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Excepcions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programació"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Mostra totes les excepcions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Excepcions si està activat el mode No molestis"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Persones"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacions"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes i altres interrupcions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programacions"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificacions silenciades"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Quan actives el mode No molestis, el so i la vibració se silencien excepte per a aquells elements que hagis permès més amunt."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Silencia-ho tot excepte"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Silenciat"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Converses"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permet els missatges"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Per assegurar-te que els missatges permesos emetin so, comprova les opcions de configuració del dispositiu (so, vibració o silenci)."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Cap"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"No permetis cap trucada"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"No permetis cap missatge"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permet les alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De temporitzadors, alarmes, sistemes de seguretat i altres aplicacions"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reprodueix els sons multimèdia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons multimèdia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, jocs i altre contingut multimèdia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multimèdia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permet els sons tàctils"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons en tocar"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Del teclat i altres botons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons en tocar"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permet els recordatoris"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Recordatoris"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tasques i recordatoris"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"recordatoris"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permet els esdeveniments"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Esdeveniments"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De pròxims esdeveniments del calendari"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permet que les aplicacions ignorin el mode No molestis"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Excepcions d\'aplicacions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Mostra sobre altres aplicacions"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permet mostrar sobre altres aplicacions"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permet que aquesta aplicació es mostri sobre les altres aplicacions que estiguis utilitzant. És possible que interfereixi amb l\'ús que fas d\'aquestes aplicacions i canviï la manera com es mostren o es comporten."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Accés a tots els fitxers"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Permet l\'accés per gestionar tots els fitxers"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permet que aquesta aplicació llegeixi, modifiqui i suprimeixi tots els fitxers d\'aquest dispositiu o de qualsevol volum d\'emmagatzematge connectat. L\'aplicació podrà accedir als fitxers sense el teu coneixement explícit."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pot accedir a tots els fitxers"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"RV realitat virtual processador estèreo servei ajuda"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Mostra sobre altres aplicacions"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicacions que poden es mostrar sobre altres"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ca88812..e1cf561 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Ochrana soukromí"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Zakázáno administrátorem"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nedostupné"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Stav zabezpečení"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámek obrazovky, odemknutí obličejem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámek obrazovky, otisky prstů"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Při použití odemknutí obličejem v aplikacích vždy vyžadovat potvrzení"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Smazat data obličeje"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastavit odemknutí obličejem"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Pomocí odemknutí obličejem můžete odemykat zařízení, přihlašovat se do aplikací a potvrzovat platby.\n\nPřipomínáme:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když jej namíří na váš obličej a vy budete mít otevřené oči.\n\nTelefon by mohla odemknout i osoba, která je vám hodně podobná, například vaše dvojče."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Pomocí odemknutí obličejem můžete odemykat zařízení, přihlašovat se do aplikací a potvrzovat platby.\n\nPřipomínáme:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když ho namíří na váš obličej.\n\nTelefon může odemknout i osoba, která je vám hodně podobná, například vaše dvojče."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Pomocí odemknutí obličejem můžete odemykat zařízení, přihlašovat se do aplikací a potvrzovat platby.\n\nPřipomínáme:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když ho namíří na váš obličej (i když budete mít zavřené oči).\n\nTelefon by mohla odemknout i osoba, která je vám hodně podobná, například vaše dvojče."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Smazat data o obličeji?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Údaje o obličeji používané k odemknutí obličejem budou trvale a bezpečně smazány. Po odstranění budete k odemknutí telefonu, přihlášení do aplikace nebo potvrzení platby muset zadat PIN, gesto nebo heslo."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identita"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymní identita"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Heslo"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikátor hesla SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Zobrazovat heslo"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Vybrat pásmo přístupového bodu"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatické"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Sdílení Wi‑Fi s tímto zařízením…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Připojování…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Sdílet hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potvrďte, že jste to vy"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Ověřte svou totožnost"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikdy se automaticky nevypne"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Vypne se automaticky za úsvitu"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tmavý motiv používá skutečnou černou a prodlužuje tak výdrž baterie. Plány tmavého motivu čekají na zapnutí, dokud se obrazovka nevypne."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tmavý motiv u některých obrazovek používá černé pozadí a prodlužuje tak výdrž baterie. Plány tmavého motivu čekají na zapnutí, dokud se obrazovka nevypne."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Interval vypnutí obrazovky"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Otisk vyžaduje nastavení PINu"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Z bezpečnostních důvodů nastavte gesto"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Znovu zadejte heslo"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Zadejte pracovní heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potvrďte své gesto"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Zadejte pracovní gesto"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Znovu zadejte PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Zadejte pracovní PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Hesla nejsou shodná"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Kódy PIN nejsou shodné"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Znovu zadejte gesto"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Čtečka obrazovky určená primárně pro nevidomé a slabozraké"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Klepněte na položky na obrazovce, které chcete přečíst"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Zvětšení"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast zvětšení"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Zobrazit ovladač posunutí"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Zobrazit ovladač pro posunutí oblasti zvětšení"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Nastavení zvětšení"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Zvětšení zkratkou a trojitým klepnutím"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Zvětšení"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Možnosti"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Přiblížení obrazovky"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Trojitým klepnutím aktivujete přiblížení"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Přiblížení zobrazení klepnutím na tlačítko"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Vybrat SIM kartu"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranžová"</string>
     <string name="color_purple" msgid="6603701972079904843">"Nachová"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Růžová"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nejsou vloženy žádné SIM karty"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Stav SIM karty"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stav SIM karty (slot na SIM kartu %1$d)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="one">1 aktivováno</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Zapněte funkci Nerušit"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Výjimky"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokovat vizuální vyrušení"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Povolit vizuální signály"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Když je zapnut režim Nerušit"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Povolit vyrušení, která vydávají zvuk"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Omezit oznámení"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Oznámení bez zvukového upozornění"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Oznámení se zobrazí na obrazovce"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Vypnout zvuk zařízení, ale povolit výjimky"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Výjimky"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Plán"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Zobrazit všechny výjimky"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Výjimky při zapnutém režimu Nerušit"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Lidé"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikace"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Budíky a další vyrušení"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Plány"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Ztlumená oznámení"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Když je zapnut režim Nerušit, zvuky a vibrace budou ztlumeny (kromě položek, které povolíte výše)."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Ztlumeno vše kromě"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Ztlumeno"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Konverzace"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Povolit zprávy"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Chcete-li zajistit, aby povolené zprávy vydávaly zvuk, zkontrolujte, zda je zařízení nastavené na vyzvánění, vibraci či tichý režim."</string>
     <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>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Žádné"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Nepovolit žádné hovory"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Nepovolit žádné zprávy"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Povolit budíky"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Budíky"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Z časovačů, budíků, bezpečnostních systémů a dalších aplikací"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"budíky"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Přehrávat zvuky médií"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvuky médií"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Z videí, her a dalších médií"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"média"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Povolit zvuky při dotyku"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvuky při dotyku"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Z klávesnice a dalších tlačítek"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvuky při dotyku"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Povolit připomenutí"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Připomenutí"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Z úkolů a připomenutí"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"připomenutí"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Povolit události"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Události"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Z nadcházejících událostí v kalendáři"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Povolit přepisování aplikací"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Výjimky aplikací"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Zobrazit přes ostatní aplikace"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Povolit zobrazení přes jiné aplikace"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Umožní této aplikaci zobrazovat se přes ostatní aplikace, které používáte. Může tak narušit vaši práci s těmito aplikacemi a změnit způsob jejich zobrazování nebo chování."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Přístup ke všem souborům"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Povolte přístup ke správě všech souborů"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Povolte aplikaci načítat, upravovat a mazat soubory v tomto zařízení a v připojených úložištích. Pokud aplikaci oprávnění udělíte, bude moci k souborům přistupovat i bez vašeho vědomí."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Mají přístup ke všem souborům"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtuální realita přijímač stereo pomocná služba"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Zobrazit přes ostatní aplikace"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Aplikace s povolením k zobrazení přes ostatní aplikace: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8654192..af7f907 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatliv"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Deaktiveret af administratoren"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ikke tilgængelig"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sikkerhedsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skærmlås, Ansigtslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skærmlås, fingeraftryk"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kræv altid et bekræftelsestrin ved brug af ansigtslås i apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Slet ansigtsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurer ansigtslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Brug ansigtslås til at låse din enhed op, logge ind på apps og bekræfte betalinger.\n\nBemærk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan låses op af en anden, hvis den holdes op foran dit ansigt, mens dine øjne er åbne.\n\nDin telefon kan låses op af en anden, der ligner dig meget, f.eks. en tvilling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Brug ansigtslås til at låse din enhed op, logge ind på apps og bekræfte betalinger.\n\nBemærk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan låses op af en anden, hvis den holdes op foran dit ansigt.\n\nDin telefon kan låses op af en anden, der ligner dig meget, f.eks. en søskende."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Brug ansigtslås til at låse din enhed op, logge ind på apps og bekræfte betalinger.\n\nBemærk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan låses op af en anden, hvis den holdes op foran dit ansigt, også selvom dine øjne er lukkede.\n\nDin telefon kan låses op af en anden, der ligner dig meget, f.eks. en tvilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vil du slette ansigtsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"De ansigtsdata, der anvendes af ansigtslåsen, slettes perment og forsvarligt. Efter fjernelsen skal du bruge din pinkode, dit mønster eller din adgangskode til at låse telefonen op, logge ind i apps og bekræfte betalinger."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonym identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Adgangskode"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Adgangskode-id til SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Vis adgangskode"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Vælg AP-bånd"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatisk"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deler Wi-Fi med denne enhed…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Opretter forbindelse…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Del hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Bekræft, at det er dig"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Bekræft, at det er dig"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Til/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Deaktiveres aldrig automatisk"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Deaktiveres automatisk ved solopgang"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Mørkt tema bruger ægte sort for at spare på batteriet. Tidsplaner for Mørkt tema aktiveres først, når din skærm er slukket."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Mørkt tema bruger en sort baggrund på nogle skærme for at spare på batteriet. Tidsplaner for Mørkt tema aktiveres først, når din skærm er slukket."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Timeout for skærmen"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Angiv pinkode for at bruge fingeraftryk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Angiv et mønster af hensyn til sikkerheden"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Angiv din adgangskode igen"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Angiv adgangskoden til din arbejdsprofil"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekræft dit mønster"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Angiv mønsteret til din arbejdsprofil"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Angiv din pinkode igen"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Angiv pinkoden til din arbejdsprofil"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Adgangskoderne matcher ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Pinkoderne matcher ikke"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Tegn dit mønster igen"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Skærmlæseren er primært til blinde og svagtseende brugere"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tryk på elementer på din skærm for at få dem læst op"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Forstør"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Vis controller til flytning"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Vis en joystick-lignende controller til flytning af forstørrelsesområdet"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Indstillinger for forstørrelse"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Brug en genvej til forstørrelse med tre tryk"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Om Forstør"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Valgmuligheder"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom ind på skærmen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tryk tre gange for at zoome ind"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tryk på en knap for at zoome"</string>
@@ -2390,7 +2396,7 @@
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Blev begrænset <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="restricted_app_detail_footer" msgid="3683577206409650564">"Disse apps har brugt batteri i baggrunden. Begrænsede apps fungerer muligvis ikke korrekt, og notifikationer kan være forsinkede."</string>
     <string name="battery_auto_restriction_title" msgid="827206218118093357">"Brug batteriadministration"</string>
-    <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Registrer, nå apps dræner batteriet"</string>
+    <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Registrer, når apps dræner batteriet"</string>
     <string name="battery_manager_on" msgid="3197525907390349054">"Til – Registrerer, når apps dræner batteriet"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Fra"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
@@ -2474,7 +2480,7 @@
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Brugerens batteriforbrug"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Strømforbrug, diverse"</string>
-    <string name="battery_msg_unaccounted" msgid="5647345548624995064">"Batteriforbrug er en tilnærmet beregning af strømforbruget og omfatter ikke alle årsager til afladning af batteriet. \"Diverse\" er forskellen mellem den tilnærmede beregning af strømforbruget og det faktiske forbrug, der er registreret for batteriet."</string>
+    <string name="battery_msg_unaccounted" msgid="5647345548624995064">"Batteriforbrug er en tilnærmet beregning af strømforbruget og omfatter ikke alle årsager til, at batteriet drænes. \"Diverse\" er forskellen mellem den tilnærmede beregning af strømforbruget og det faktiske forbrug, der er registreret for batteriet."</string>
     <string name="battery_desc_overcounted" msgid="5982079150027267539">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="3604527474433227780">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="6401552215008504483">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Vælg SIM-kort"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lilla"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Lyserød"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Der er ikke isat et SIM-kort"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-status (SIM-kortrille %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> er aktiveret</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivér Forstyr ikke"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Undtagelser"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloker visuelle forstyrrelser"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillad visuelle signaler"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Når Forstyr ikke er aktiveret"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillad afbrydelser, der laver lyd"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Begræns notifikationer"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ingen lyd fra notifikationer"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Notifikationer vises på skærmen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Sæt enheden på lydløs, men tillad undtagelser"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Undtagelser"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Tidsplan"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Se alle undtagelser"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Undtagelser når \"Forstyr ikke\" er aktiveret"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmer og andre afbrydelser"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Tidsplaner"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Lydløse notifikationer"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Når Forstyr ikke er aktiveret, er der kun lyd eller vibration ved de elementer, du tillader ovenfor."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Slå lyden fra for alle med undtagelse af"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Lyden er slået fra"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Samtaler"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Tillad beskeder"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Hvis du vil være sikker på, at tilladte beskeder kan høres, kan du tjekke, om din enhed er indstillet til at ringe eller vibrere, eller om lyden er slået fra."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ingen"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Tillad ingen opkald"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Tillad ingen beskeder"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Tillad alarmer"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmer"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Fra timere, alarmer, sikkerhedssystemer og andre apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmer"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Afspil medielyde"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Lyd fra medier"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Fra videoer, spil og andre medier"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"medier"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Tillad lyd ved berøring"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Lyd ved berøring"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Fra tastaturet og andre knapper"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"lyd ved berøring"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Tillad påmindelser"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Påmindelser"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Fra opgaver og påmindelser"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"påmindelser"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Tillad begivenheder"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Begivenheder"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Fra kommende kalenderbegivenheder"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillad, at apps tilsidesætter"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Appundtagelser"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3818,7 +3834,7 @@
     <string name="high_power_on" msgid="8778058701270819268">"Ikke-optimeret"</string>
     <string name="high_power_off" msgid="317000444619279018">"Optimerer batteriforbruget"</string>
     <string name="high_power_system" msgid="3966701453644915787">"Batterioptimering er ikke tilgængelig"</string>
-    <string name="high_power_desc" msgid="2753076899835765338">"Undlad at anvende batterioptimering. Batteriet aflades muligvis hurtigere."</string>
+    <string name="high_power_desc" msgid="2753076899835765338">"Undlad at anvende batterioptimering. Dette kan dræne batteriet hurtigere."</string>
     <string name="high_power_prompt_title" msgid="2574478825228409124">"Vil du give appen tilladelse til altid at køre i baggrunden?"</string>
     <string name="high_power_prompt_body" msgid="6460557929559616041">"Hvis du giver <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til altid at køre i baggrunden, kan det reducere batteritiden. \n\nDu kan ændre dette senere under Indstillinger &gt; Apps og notifikationer."</string>
     <string name="battery_summary" msgid="2491764359695671207">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> brugt siden sidste fulde opladning"</string>
@@ -3901,7 +3917,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Alle Forstyr ikke-regler, der er oprettet af denne app, fjernes."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Undlad at optimere"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimer"</string>
-    <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Kan medføre, at batteriet aflades hurtigere. Appen forhindres ikke længere i at bruge batteri i baggrunden."</string>
+    <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Dette kan dræne batteriet hurtigere. Appen forhindres ikke længere i at bruge batteri i baggrunden."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Anbefales for længere batteritid"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"Vil du tillade, at <xliff:g id="APP">%s</xliff:g> ignorerer batterioptimeringer?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"Ingen"</string>
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Vis oven på andre apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Tillad visning over andre apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Tillad, at denne app vises oven på andre apps, du bruger. Dette kan forstyrre din brug af disse apps eller ændre deres udseende eller adfærd."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Adgang til alle filer"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Tillad administrationsadgang til alle filer"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Giv denne app tilladelse til at læse, ændre og slette alle filer på denne enhed eller andre tilsluttede lagringsløsninger. Hvis du giver tilladelse til dette, kan appen få adgang til dine filer, uden du specifikt bliver gjort opmærksom på det."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Kan få adgang til alle filer"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reality lyttefunktion stereo hjælpetjeneste"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Vis oven på andre apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> apps må vises oven på andre apps"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c759080..6b10bf2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldedatenspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldedatenspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Datenschutz"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Vom Administrator deaktiviert"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nicht verfügbar"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sicherheitsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Displaysperre, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Displaysperre und Fingerabdruck"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Bei der Nutzung von Face Unlock in Apps immer Bestätigung anfordern"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Gesichtserkennungsdaten löschen"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Face Unlock einrichten"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, während deine Augen geöffnet sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise deinem eineiigen Zwilling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Funktion nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise deinem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Gesichtserkennungsdaten löschen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Die von Face Unlock aufgezeichneten Gesichtserkennungsdaten werden endgültig und sicher gelöscht. Nach dem Entfernen benötigst du wieder deine PIN, dein Muster oder dein Passwort, um dein Smartphone entsperren, dich bei Apps anmelden und Zahlungen bestätigen zu können."</string>
@@ -878,7 +878,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identität"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonyme Identität"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Passwort"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-Passwort-Kennzeichnung"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Passwort anzeigen"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Band für Zugangspunkt auswählen"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatisch"</string>
@@ -919,9 +918,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"WLAN wird für dieses Gerät freigegeben…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Verbindung wird hergestellt…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspot teilen"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Identität bestätigen"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Deine Identität bestätigen"</string>
     <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" 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>
@@ -1227,7 +1228,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"An/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Wird nie automatisch deaktiviert"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wird automatisch bei Sonnenaufgang deaktiviert"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Beim dunklen Design ist der Hintergrund schwarz, damit dein Akku länger hält. Zeitpläne für das dunkle Design werden erst aktiviert, wenn das Display aus ist."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Beim dunklen Design ist der Hintergrund einiger Bildschirme schwarz, damit dein Akku länger hält. Zeitpläne für das dunkle Design werden erst aktiviert, wenn das Display aus ist."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Display automatisch ausschalten"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -1715,8 +1716,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Richte zur Sicherheit ein Muster ein"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Passwort noch einmal eingeben"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Passwort deines Arbeitsprofils eingeben"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Muster bestätigen"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Arbeitsprofil-Muster eingeben"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN noch einmal eingeben"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"PIN deines Arbeitsprofils eingeben"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Die Passwörter stimmen nicht überein."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Die PINs stimmen nicht überein"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Muster noch einmal zeichnen"</string>
@@ -2052,20 +2056,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Der Screenreader ist in erster Linie für Blinde und Menschen mit eingeschränktem Sehvermögen bestimmt"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tippe auf dem Bildschirm auf Elemente, damit sie vorgelesen werden"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Untertitel-Einstellungen"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergrößerung"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Vergrößern"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrößerungsbereich"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Verschieben-Steuerelement anzeigen"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Joystick-ähnliches Steuerelement zum Verschieben des Vergrößerungsbereichs anzeigen"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Vergrößerungseinstellungen"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Mit Tastenkombination und 3-mal Tippen vergrößern"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Informationen zum Vergrößern"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Optionen"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Auf dem Bildschirm heranzoomen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Zum Zoomen dreimal tippen"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zum Zoomen auf eine Schaltfläche tippen"</string>
@@ -3085,6 +3091,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM-Karte auswählen"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lila"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Keine SIM-Karte eingelegt"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status der SIM-Karte"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-Status (SIM-Steckplatz %1$d)"</string>
@@ -3247,6 +3254,8 @@
       <item quantity="one">1 aktiviert</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Bitte nicht stören"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Unterbrechungen einschränken"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Bitte nicht stören\" aktivieren"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Ausnahmen"</string>
@@ -3273,7 +3282,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Visuelle Störungen blockieren"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Visuelle Signale zulassen"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Wenn \"Bitte nicht stören\" aktiviert ist"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Benachrichtigungen einschränken"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Kein akustisches Signal bei Benachrichtigungen"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Benachrichtigungen werden angezeigt"</string>
@@ -3334,10 +3344,18 @@
       <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_category_behavior" msgid="4456460102057665854">"Gerät stummschalten, aber Ausnahmen zulassen"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Ausnahmen"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Zeitplan"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Alle Ausnahmen anzeigen"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"Wenn \"Bitte nicht stören\" aktiviert ist, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollten."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Alle stummschalten außer"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Stummgeschaltet"</string>
@@ -3597,6 +3615,8 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> weitere Personen</item>
       <item quantity="one">1 weitere Person</item>
     </plurals>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"Nachrichten zulassen"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Damit sichergestellt ist, dass bei einer zugelassenen Nachricht auch wirklich ein akustisches Signal ertönt, solltest du kontrollieren, dass der Klingeltonmodus aktiviert ist. Beim Vibrationsmodus oder beim Lautlosmodus ertönt kein solches Signal."</string>
     <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>
@@ -3610,15 +3630,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Keine"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Keine Anrufe zulassen"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Keine Nachrichten zulassen"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Weckrufe zulassen"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Weckrufe"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"Wecker"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Medientöne abspielen"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"Medien"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Töne bei Berührung zulassen"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Töne bei Berührung"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"Töne bei Berührung"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Erinnerungen zulassen"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Erinnerungen"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"Erinnerungen"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Termine zulassen"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Termine"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Überschreiben durch Apps zulassen"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App-Ausnahmen"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3914,6 +3945,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Über anderen Apps einblenden"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Einblendung über anderen Apps zulassen"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Erlaube, dass diese App über anderen Apps eingeblendet wird. Dies beeinträchtigt möglicherweise deine Nutzung dieser Apps oder ändert deren Darstellung oder Verhalten."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Zugriff auf alle Dateien"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Zugriff zum Verwalten aller Dateien zulassen"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Du kannst dieser App erlauben, alle Dateien auf diesem Gerät bzw. allen verknüpften Speicherlaufwerken zu lesen, zu ändern und zu löschen. Sie kann dann ohne deine explizite Zustimmung auf Dateien zugreifen."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Auf alle Dateien zugreifen"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuelle realität listener stereo hilfe dienst"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Über anderen Apps einblenden"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> von <xliff:g id="COUNT_1">%2$d</xliff:g> Apps dürfen über anderen eingeblendet werden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ac6e3d4..0969245 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Απόρρητο"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Απενεργοποιήθηκε από τον διαχειριστή"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Μη διαθέσιμη"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Κατάσταση ασφάλειας"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Κλείδωμα οθόνης, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Κλείδωμα οθόνης, δακτυλικό αποτύπωμα"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Για χρήση του Face Unlock σε εφαρμ. να απαιτείται το βήμα επιβεβαίωσης"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Διαγρ. δεδ. προσώπου"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Ρύθμιση του Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Χρησιμοποιήστε το Face Unlock για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές.\n\nΛάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας και έχετε τα μάτια ανοικτά.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, το παιδί σας ή τον δίδυμο αδελφό σας."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Χρησιμοποιήστε το Face Unlock, για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές.\n\nΛάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, τον δίδυμο αδελφό σας."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Χρησιμοποιήστε το Face Unlock για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές.\n\nΛάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν είναι στραμμένο προς το πρόσωπό σας ακόμη και αν τα μάτια σας είναι κλειστά.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, το παιδί σας ή τον δίδυμο αδελφό σας."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Διαγραφή δεδομένων προσώπου;"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Τα δεδομένα προσώπου που χρησιμοποιεί το Face Unlock θα διαγραφούν οριστικά και με ασφάλεια. Μετά την κατάργηση, θα χρειαστείτε το PIN, το μοτίβο ή τον κωδικό πρόσβασης, για να ξεκλειδώσετε το τηλέφωνό σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Ταυτότητα"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Ανώνυμη ταυτότητα"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Κωδικός πρόσβασης"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Αναγνωριστικό κωδ. πρόσβασης SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Εμφάνιση κωδικού πρόσβασης"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Επιλέξτε ζώνη σημείου πρόσβασης"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Αυτόματα"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Κοινή χρήση Wi‑Fi με αυτήν τη συσκευή…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Σύνδεση…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Κοινή χρήση σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Επαλήθευση ταυτότητας"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Επαληθεύστε την ταυτότητά σας"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ενεργή / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Δεν θα απενεργοποιείται ποτέ αυτόματα"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Θα απενεργοποιείται αυτόματα κατά την ανατολή του ηλίου"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Το Σκούρο θέμα χρησιμοποιεί μαύρο χρώμα για να συμβάλλει στην αύξηση της διάρκειας της μπαταρίας. Τα χρονοδιαγράμματα για το Σκούρο θέμα περιμένουν να σβήσει η οθόνη, για να ενεργοποιηθούν."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Το Σκούρο θέμα χρησιμοποιεί μαύρο φόντο, για να συμβάλλει στην αύξηση της διάρκειας της μπαταρίας σε ορισμένες οθόνες. Τα χρονοδιαγράμματα για το Σκούρο θέμα περιμένουν να σβήσει η οθόνη, για να ενεργοποιηθούν."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Λήξη χρονικού ορίου οθόνης"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Η οθόνη απενεργοποιείται"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Για δακτ. αποτυπ. ορίστε PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Για λόγους ασφαλείας, ορίστε ένα μοτίβο"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Εισαγάγετε ξανά τον κωδικό πρόσβασής σας"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Εισαγάγετε κωδικό πρόσβασης εργασίας"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Επιβεβαίωση μοτίβου"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Εισαγάγετε μοτίβο εργασίας"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Εισαγάγετε ξανά τον αριθμό PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Εισαγάγετε PIN εργασίας"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Οι κωδικοί πρόσβασης δεν ταιριάζουν"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Σχεδιάστε ξανά το μοτίβο σας"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Ο αναγνώστης οθόνης απευθύνεται κυρίως σε άτομα με τύφλωση και μειωμένη όραση"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Πατήστε στοιχεία στην οθόνη σας για να ακούσετε την εκφώνησή τους"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Προτιμήσεις υπότιτλων"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Μεγιστοποίηση"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Μεγέθυνση"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Περιοχή μεγέθυνσης"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Εμφάνιση χειριστηρίου κίνησης"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Εμφάνιση χειριστηρίου για τη μετακίνηση της περιοχής μεγέθυνσης"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Ρυθμίσεις μεγέθυνσης"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Μεγέθυνση με συντόμευση και τριπλό πάτημα"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Σχετικά με τη Μεγέθυνση"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Επιλογές"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Μεγέθυνση στην οθόνη"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Πατήστε 3 φορές για εστίαση"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Πατήστε ένα κουμπί για εστίαση"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Επιλογή κάρτας SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Πορτοκαλί"</string>
     <string name="color_purple" msgid="6603701972079904843">"Μοβ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ροζ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Δεν έχουν τοποθετηθεί κάρτες SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Κατάσταση κάρτας SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Κατάσταση SIM (υποδοχή sim %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 ενεργός</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ενεργοποίηση λειτουργίας \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Εξαιρέσεις"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Αποκλ. οπτικών αντιπ/σμών"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Να επιτρέπονται οπτικά σήματα"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Να επιτρέπονται οι διακοπές που συνοδεύονται από ήχο"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Περιορισμός ειδοποιήσεων"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ειδοποιήσεις χωρίς ήχο"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Θα βλέπετε ειδοποιήσεις στην οθόνη σας"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> πργράμματα μπορούν να ενεργοποιηθούν αυτόματα</item>
       <item quantity="one">Ένα πρόγραμμα μπορεί να ενεργοποιηθεί αυτόματα</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Σίγαση συσκευής αλλά αποδοχή εξαιρέσεων"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Εξαιρέσεις"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Πρόγραμμα"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Εμφάνιση όλων των εξαιρέσεων"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Εξαιρέσεις όταν είναι ενεργή η λειτουργία Μην ενοχλείτε"</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_schedule" msgid="2003707171924226212">"Χρονοδιαγράμματα"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Ειδοποιήσεις σε σίγαση"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", ο ήχος και η δόνηση θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Σίγαση όλων εκτός"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Σε σίγαση"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ακόμα</item>
       <item quantity="one">1 ακόμα</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Συνομιλίες"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Να επιτρέπονται τα μηνύματα"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Για να βεβαιωθείτε ότι γίνεται αναπαραγωγή ήχου για τα επιτρεπόμενα μηνύματα, ελέγξτε εάν έχει ρυθμιστεί το κουδούνισμα, η δόνηση ή η αθόρυβη λειτουργία στη συσκευή σας."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Τα εισερχόμενα μηνύματα έχουν αποκλειστεί για το <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέψετε στους φίλους, στην οικογένεια και σε άλλες επαφές να επικοινωνήσουν μαζί σας."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Κανένα"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"να μην επιτρέπονται οι κλήσεις"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"να μην επιτρέπονται μηνύματα"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Να επιτρέπονται τα ξυπνητήρια"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Ξυπνητήρια"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Από χρονόμετρα, ξυπνητήρια, συστήματα ασφαλείας και άλλες εφαρμογές"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ξυπνητήρια"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Αναπαραγωγή ήχων μέσων"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Ήχοι μέσων"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Από βίντεο, παιχνίδια και άλλα μέσα"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"μέσα"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Να επιτρέπονται οι ήχοι αφής"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Ήχοι αφής"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Από το πληκτρολόγιό σας και άλλα κουμπιά"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ήχοι αφής"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Να επιτρέπονται οι υπενθυμίσεις"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Υπενθυμίσεις"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Από εργασίες και υπενθυμίσεις"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"υπενθυμίσεις"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Να επιτρέπονται οι εκδηλώσεις"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Συμβάντα"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Από επερχόμενα συμβάντα ημερολογίου"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Να επιτρέπεται στις εφαρμογές η παράκαμψη"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Εξαιρέσεις εφαρμογών"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Εμφάνιση πάνω σε άλλες εφαρμογές"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Να επιτρέπεται η εμφάνιση πάνω σε άλλες εφαρμογές"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Επιτρέψτε σε αυτήν την εφαρμογή να εμφανίζεται πάνω από άλλες εφαρμογές που χρησιμοποιείτε. Μπορεί να επηρεάσει τη χρήση αυτών των εφαρμογών ή να αλλάξει τον τρόπο εμφάνισης ή συμπεριφοράς τους."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Πρόσβαση σε όλα τα αρχεία"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Να επιτρέπεται η πρόσβαση για τη διαχείριση όλων των αρχείων"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Να επιτρέπεται σε αυτήν την εφαρμογή η ανάγνωση, η τροποποίηση και η διαγραφή όλων των αρχείων σε αυτήν τη συσκευή και σε κάθε συνδεδεμένη μονάδα αποθήκευσης. Εάν εκχωρηθούν σχετικά δικαιώματα, η εφαρμογή μπορεί να έχει πρόσβαση σε αρχεία χωρίς να έχετε ενημερωθεί ρητά."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Με πρόσβαση σε όλα τα αρχεία"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"βοηθητική υπηρεσία στερεοφωνική ακρόαση εικονική πραγματικότητα vr"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Εμφάνιση πάνω σε άλλες εφαρμογές"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> από τις <xliff:g id="COUNT_1">%2$d</xliff:g> εφαρμογές μπορούν να εμφανίζονται πάνω σε άλλες"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index adbd4ab..fc412b4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Disabled by admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Not available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Security status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using Face Unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use Face Unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, such as an identical sibling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous identity"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE password identifier"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Show password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Sharing Wi‑Fi with this device…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connecting…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Share hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verify that it\'s you"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verify that it\'s you"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"For security, set pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Re-enter your password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Enter your work password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Enter your work pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Re-enter your PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Enter your work PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don\'t match"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Draw your pattern again"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tap items on your screen to hear them read aloud"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Show move controller"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Show a joystick-like controller to move the magnification area"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Magnify settings"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Magnify with shortcut &amp; triple-tap"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"About Magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom in on screen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Select SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purple"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM status (sim slot %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 enabled</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"When Do Not Disturb is on"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restrict notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"You will see notifications on your screen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Mute device but allow exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Schedule"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"See all exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions when Do Not Disturb is on"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms and other interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Schedules"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Silenced notifications"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Mute all except"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Muted"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="one">1 other</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"None"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Don’t allow any calls"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Don’t allow any messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Allow alarms"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems and other apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarms"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Play media sounds"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media sounds"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"From videos, games and other media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Allow touch sounds"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Touch sounds"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"From your keyboard and other buttons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"touch sounds"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Allow reminders"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Reminders"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"From tasks and reminders"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"reminders"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Allow events"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Events"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"From upcoming calendar events"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App exceptions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Display over other apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Allow display over other apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"All files access"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Allow access to manage all files"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Can access all files"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtual reality listener stereo helper service"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0d4d68b..a6329c1 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Disabled by admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Not available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Security status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using Face Unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use Face Unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, such as an identical sibling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous identity"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE password identifier"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Show password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Sharing Wi‑Fi with this device…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connecting…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Share hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verify that it\'s you"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verify that it\'s you"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"For security, set pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Re-enter your password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Enter your work password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Enter your work pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Re-enter your PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Enter your work PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don\'t match"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Draw your pattern again"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tap items on your screen to hear them read aloud"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Show move controller"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Show a joystick-like controller to move the magnification area"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Magnify settings"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Magnify with shortcut &amp; triple-tap"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"About Magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom in on screen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Select SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purple"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM status (sim slot %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 enabled</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"When Do Not Disturb is on"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restrict notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"You will see notifications on your screen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Mute device but allow exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Schedule"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"See all exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions when Do Not Disturb is on"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms and other interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Schedules"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Silenced notifications"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Mute all except"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Muted"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="one">1 other</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"None"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Don’t allow any calls"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Don’t allow any messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Allow alarms"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems and other apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarms"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Play media sounds"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media sounds"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"From videos, games and other media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Allow touch sounds"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Touch sounds"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"From your keyboard and other buttons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"touch sounds"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Allow reminders"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Reminders"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"From tasks and reminders"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"reminders"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Allow events"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Events"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"From upcoming calendar events"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App exceptions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Display over other apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Allow display over other apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"All files access"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Allow access to manage all files"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Can access all files"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtual reality listener stereo helper service"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index adbd4ab..fc412b4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Disabled by admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Not available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Security status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using Face Unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use Face Unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, such as an identical sibling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous identity"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE password identifier"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Show password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Sharing Wi‑Fi with this device…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connecting…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Share hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verify that it\'s you"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verify that it\'s you"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"For security, set pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Re-enter your password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Enter your work password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Enter your work pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Re-enter your PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Enter your work PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don\'t match"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Draw your pattern again"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tap items on your screen to hear them read aloud"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Show move controller"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Show a joystick-like controller to move the magnification area"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Magnify settings"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Magnify with shortcut &amp; triple-tap"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"About Magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom in on screen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Select SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purple"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM status (sim slot %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 enabled</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"When Do Not Disturb is on"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restrict notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"You will see notifications on your screen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Mute device but allow exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Schedule"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"See all exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions when Do Not Disturb is on"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms and other interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Schedules"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Silenced notifications"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Mute all except"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Muted"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="one">1 other</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"None"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Don’t allow any calls"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Don’t allow any messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Allow alarms"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems and other apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarms"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Play media sounds"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media sounds"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"From videos, games and other media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Allow touch sounds"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Touch sounds"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"From your keyboard and other buttons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"touch sounds"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Allow reminders"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Reminders"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"From tasks and reminders"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"reminders"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Allow events"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Events"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"From upcoming calendar events"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App exceptions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Display over other apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Allow display over other apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"All files access"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Allow access to manage all files"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Can access all files"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtual reality listener stereo helper service"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6900f10..86e7893 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Disabled by admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Not available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Security status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using Face Unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use Face Unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, such as an identical sibling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous identity"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE password identifier"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Show password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Sharing Wi‑Fi with this device…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connecting…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Share hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verify that it\'s you"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verify that it\'s you"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Screen timeout"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"For security, set pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Re-enter your password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Enter your work password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Enter your work pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Re-enter your PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Enter your work PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don\'t match"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Draw your pattern again"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tap items on your screen to hear them read aloud"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Show move controller"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Show a joystick-like controller to move the magnification area"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Magnify settings"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Magnify with shortcut &amp; triple-tap"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"About Magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom in on screen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Select SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purple"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM status (sim slot %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 enabled</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"When Do Not Disturb is on"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restrict notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"You will see notifications on your screen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Mute device but allow exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Schedule"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"See all exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions when Do Not Disturb is on"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms and other interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Schedules"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Silenced notifications"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Mute all except"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Muted"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="one">1 other</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"None"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Don’t allow any calls"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Don’t allow any messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Allow alarms"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems and other apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarms"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Play media sounds"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media sounds"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"From videos, games and other media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Allow touch sounds"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Touch sounds"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"From your keyboard and other buttons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"touch sounds"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Allow reminders"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Reminders"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"From tasks and reminders"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"reminders"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Allow events"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Events"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"From upcoming calendar events"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Allow apps to override"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App exceptions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Display over other apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Allow display over other apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"All files access"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Allow access to manage all files"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Can access all files"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtual reality listener stereo helper service"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 55c1b98..7883ce7 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎Set My Location, screen unlock, SIM card lock, credential storage lock‎‏‎‎‏‎"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎Set My Location, screen unlock, credential storage lock‎‏‎‎‏‎"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎Privacy‎‏‎‎‏‎"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎Disabled by admin‎‏‎‎‏‎"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎Not available‎‏‎‎‏‎"</string>
     <string name="security_status_title" msgid="6958004275337618656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎Security status‎‏‎‎‏‎"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎Screen lock, face unlock‎‏‎‎‏‎"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎Screen lock, fingerprint‎‏‎‎‏‎"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎When using face unlock in apps, always require confirmation step‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎Delete face data‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎Set up face unlock‎‏‎‎‏‎"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face while your eyes are open.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Delete face data?‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments.‎‏‎‎‏‎"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎Identity‎‏‎‎‏‎"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎Anonymous identity‎‏‎‎‏‎"</string>
     <string name="wifi_password" msgid="1458802324849513755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎Password‎‏‎‎‏‎"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎SAE password identifier‎‏‎‎‏‎"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎Show password‎‏‎‎‏‎"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎Select AP Band‎‏‎‎‏‎"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎Auto‎‏‎‎‏‎"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎Sharing Wi‑Fi with this device…‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎Connecting…‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎Share hotspot‎‏‎‎‏‎"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎Verify it\'s you‎‏‎‎‏‎"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎Verify that it\'s you‎‏‎‎‏‎"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎Will never turn off automatically‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎Will turn off automatically at sunrise‎‏‎‎‏‎"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off.‎‏‎‎‏‎"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.‎‏‎‎‏‎"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎Screen timeout‎‏‎‎‏‎"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎Screen turns off‎‏‎‎‏‎"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎After ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of inactivity‎‏‎‎‏‎"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎To use fingerprint, set PIN‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎For security, set pattern‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎Re-enter your password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎Enter your work password‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎Confirm your pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎Enter your work pattern‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎Re-enter your PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎Enter your work PIN‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎Passwords don’t match‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎PINs don’t match‎‏‎‎‏‎"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎Draw your pattern again‎‏‎‎‏‎"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎Screen reader primarily for people with blindness and low vision‎‏‎‎‏‎"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎Tap items on your screen to hear them read aloud‎‏‎‎‏‎"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎Caption preferences‎‏‎‎‏‎"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎Magnification‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎Magnify‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎Magnification area‎‏‎‎‏‎"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎Show move controller‎‏‎‎‏‎"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎Show a joystick-like controller to move the magnification area‎‏‎‎‏‎"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎Magnify settings‎‏‎‎‏‎"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎Magnify with shortcut &amp; triple-tap‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎About Magnify‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎Options‎‏‎‎‏‎"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎Zoom in on screen‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎Tap 3 times to zoom‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎Tap a button to zoom‎‏‎‎‏‎"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎Select SIM card‎‏‎‎‏‎"</string>
     <string name="color_orange" msgid="216547825489739010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎Orange‎‏‎‎‏‎"</string>
     <string name="color_purple" msgid="6603701972079904843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎Purple‎‏‎‎‏‎"</string>
+    <string name="color_pink" msgid="8596872110888626708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎Pink‎‏‎‎‏‎"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎No SIM cards inserted‎‏‎‎‏‎"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎SIM status‎‏‎‎‏‎"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎SIM status (sim slot %1$d)‎‏‎‎‏‎"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎1 enabled‎‏‎‎‏‎</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎Turn on Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎Exceptions‎‏‎‎‏‎"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="MODE">%1$s</xliff:g>‎‏‎‎‏‏‏‎: ‎‏‎‎‏‏‎<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎Block visual disturbances‎‏‎‎‏‎"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎Allow visual signals‎‏‎‎‏‎"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎When Do Not Disturb is on‎‏‎‎‏‎"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎Allow interruptions that make sound‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎Restrict notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎No sound from notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎You will see notifications on your screen‎‏‎‎‏‎"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎Mute device but allow exceptions‎‏‎‎‏‎"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎Exceptions‎‏‎‎‏‎"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎Schedule‎‏‎‎‏‎"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎See all exceptions‎‏‎‎‏‎"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎Exceptions when Do Not Disturb is on‎‏‎‎‏‎"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎People‎‏‎‎‏‎"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎Apps‎‏‎‎‏‎"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎Alarms &amp; other interruptions‎‏‎‎‏‎"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎Schedules‎‏‎‎‏‎"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎Silenced notifications‎‏‎‎‏‎"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.‎‏‎‎‏‎"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎Mute all except‎‏‎‎‏‎"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎Muted‎‏‎‎‏‎"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUM_PEOPLE">%d</xliff:g>‎‏‎‎‏‏‏‎ others‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎1 other‎‏‎‎‏‎</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎Conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎Allow messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎To be sure allowed messages make sound, check whether your device is set to ring, vibrate, or silent.‎‏‎‎‏‎"</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎None‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎Don’t allow any calls‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎Don’t allow any messages‎‏‎‎‏‎"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎Allow alarms‎‏‎‎‏‎"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎Alarms‎‏‎‎‏‎"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎From timers, alarms, security systems, and other apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎alarms‎‏‎‎‏‎"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎Play media sounds‎‏‎‎‏‎"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎Media sounds‎‏‎‎‏‎"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎From videos, games, and other media‎‏‎‎‏‎"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎media‎‏‎‎‏‎"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎Allow touch sounds‎‏‎‎‏‎"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎Touch sounds‎‏‎‎‏‎"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎From your keyboard and other buttons‎‏‎‎‏‎"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎touch sounds‎‏‎‎‏‎"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎Allow reminders‎‏‎‎‏‎"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎Reminders‎‏‎‎‏‎"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎From tasks and reminders‎‏‎‎‏‎"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎reminders‎‏‎‎‏‎"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎Allow events‎‏‎‎‏‎"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎Events‎‏‎‎‏‎"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎From upcoming calendar events‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎Allow apps to override‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎App exceptions‎‏‎‎‏‎"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎Display over other apps‎‏‎‎‏‎"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎Allow display over other apps‎‏‎‎‏‎"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎Allow this app to display on top of other apps you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave.‎‏‎‎‏‎"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎All files access‎‏‎‎‏‎"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎Allow access to manage all files‎‏‎‎‏‎"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge.‎‏‎‎‏‎"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎Can access all files‎‏‎‎‏‎"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎vr virtual reality listener stereo helper service‎‏‎‎‏‎"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎Display over other apps‎‏‎‎‏‎"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ apps allowed to display over other apps‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c2df6ca..be3d822 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidad"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"El administrador inhabilitó esta opción"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"No disponible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estado de seguridad"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, huella digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Solicitar confirmación al usar el desbloqueo facial en apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Borrar datos faciales"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar Desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Usa el Desbloqueo facial para desbloquear tu dispositivo, acceder a apps y confirmar pagos.\n\nTen en cuenta lo siguiente:\nMirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro mientras tienes los ojos abiertos.\n\nPor otro lado, también puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Usa el desbloqueo facial para desbloquear tu dispositivo, acceder a las apps y confirmar pagos.\n\nTen en cuenta lo siguiente:\nMirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro.\n\nPor otro lado, también puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Usa el desbloqueo facial para desbloquear tu dispositivo, acceder a apps y confirmar pagos.\n\nTen en cuenta lo siguiente:\nMirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro, incluso aunque tengas los ojos cerrados.\n\nPor otro lado, también puede desbloquearlo cualquier persona que se parezca mucho a ti, como un hermano gemelo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"¿Quieres borrar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Se borrarán los datos del rostro que usa el desbloqueo facial definitivamente y de manera segura. Tras la eliminación, deberás ingresar el PIN, el patrón o la contraseña para desbloquear el teléfono, acceder a las apps y confirmar pagos."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidad anónima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Contraseña"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador de contraseña SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar contraseña"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Seleccionar banda AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automático"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartiendo Wi-Fi con este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Compartir hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifica tu identidad"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifica tu identidad"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desactivará automáticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se desactivará automáticamente al amanecer"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"El Tema oscuro usa True Black para conservar la batería durante más tiempo y se programa a fin de esperar a que se apague la pantalla para activarse."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"El Tema oscuro usa un fondo negro para conservar la batería durante más tiempo en algunas pantallas y se programa a fin de esperar a que se apague la pantalla para activarse."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tiempo de espera de la pantalla"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Configura el PIN para usar la huella"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por motivos de seguridad, establece un patrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Vuelve a ingresar tu contraseña"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ingresa tu contraseña de trabajo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirma el patrón"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ingresa tu patrón de trabajo"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Vuelve a ingresar el PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ingresa tu PIN de trabajo"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Las contraseñas no coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Los PIN no coinciden"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Dibuja el patrón una vez más"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla, principalmente, para personas con ceguera o visión reducida"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Presiona los elementos en tu pantalla para escuchar la lectura en voz alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar control de movimiento"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostrar un control similar a un joystick para mover el área de ampliación"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Configuración de ampliación"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ampliar con acceso directo y presionar tres veces"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Información sobre la ampliación"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opciones"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ampliar la pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Presiona tres veces para ampliar"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Presiona un botón para ampliar"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Seleccionar tarjeta SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Naranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Púrpura"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No se insertó ninguna tarjeta SIM."</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Estado de SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Estado de SIM (ranura de SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 habilitada</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar No interrumpir"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Excepciones"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear alteraciones visuales"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir señales visuales"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Cuando se activa No interrumpir"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Habilitar interrupciones con sonido"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringir notificaciones"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificaciones sin sonido"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Verás las notificaciones en la pantalla"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Silenciar dispositivo, pero permitir excepciones"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Excepciones"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Horarios"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ver todas las excepciones"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Excepciones cuando está activada la función No interrumpir"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmas y otras interrupciones"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programas"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificaciones silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Si activas el modo No interrumpir, se silenciarán el sonido y la vibración, excepto para los elementos que habilites arriba."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Silenciar todo excepto"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Silenciar"</string>
@@ -3594,6 +3604,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversaciones"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensajes"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para asegurarte de que el dispositivo suene cuando recibas mensajes permitidos, verifica si está configurado para sonar, vibrar o en silencio."</string>
     <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>
@@ -3607,15 +3618,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"No hay"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"No permitir llamadas"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"No permitir mensajes"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmas"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De temporizadores, alarmas, sistemas de seguridad y otras apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmas"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproducir sonidos multimedia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sonidos multimedia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De videos, juegos y otro contenido multimedia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"contenido multimedia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir tonos táctiles"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Tonos táctiles"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Del teclado y otros botones"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"tonos táctiles"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir recordatorios"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Recordatorios"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tareas y recordatorios"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"recordatorios"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De próximos eventos del calendario"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que las apps anulen No interrumpir"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Excepciones de apps"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3911,6 +3927,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Mostrar sobre otras apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir mostrar sobre otras apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permite que esta app se muestre sobre otras en uso. Es posible que interfiera con el uso de esas apps o cambie afecte su apariencia o el comportamiento."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acceso a todos los archivos"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Permitir administrar todos los archivos"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permite que esta app lea, modifique y borre todos los archivos en el dispositivo o cualquier volumen de almacenamiento conectado. Si habilitas el permiso, es posible que la app acceda a archivos sin tu conocimiento explícito."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pueden acceder a todos los archivos"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv, procesador de realidad virtual, estéreo, servicio de ayuda"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Mostrar sobre otras apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps que pueden mostrarse sobre otras apps"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0e24c2a..9c9fcb8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidad"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Inhabilitado por el administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"No disponible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estado de seguridad"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla y huella digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Solicitar confirmación al usar el desbloqueo facial en aplicaciones"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eliminar datos faciales"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Utiliza el desbloqueo facial para desbloquear tu dispositivo, iniciar sesión en aplicaciones y confirmar pagos.\n\nRecuerda:\nEs posible que el teléfono se desbloquee si lo miras aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara y tienes los ojos abiertos o frente a una foto de tu cara.\n\nEs posible que una persona que se parezca mucho a ti, como tu gemelo, pueda desbloquear el teléfono."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Con el desbloqueo facial, puedes desbloquear tu dispositivo, iniciar sesión en aplicaciones y confirmar pagos.\n\nRecuerda:\nEs posible que el teléfono se desbloquee si lo miras aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti, como tu gemelo, pueda desbloquear el teléfono."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utiliza el desbloqueo facial para desbloquear tu dispositivo, iniciar sesión en aplicaciones y confirmar pagos.\n\nRecuerda:\nEs posible que el teléfono se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara, incluso si tienes los ojos cerrados.\n\nEs posible que una persona que se parezca mucho a ti (como un hermano o una hermana) pueda desbloquear el teléfono."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"¿Quieres eliminar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Los datos faciales que se utilizan en el reconocimiento facial se eliminarán definitivamente y de forma segura. Una vez que se hayan eliminado, tendrás que usar tu PIN, tu patrón o tu contraseña para desbloquear el teléfono, iniciar sesión en aplicaciones y confirmar pagos."</string>
@@ -783,7 +783,7 @@
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="6067720758437490896">"Listo para compartir contenido de aplicaciones por NFC"</string>
     <string name="android_beam_off_summary" msgid="5693961375631325042">"Desactivado"</string>
-    <string name="nfc_disabled_summary" msgid="8737797364522502351">"No disponible porque la función NFC está desactivada"</string>
+    <string name="nfc_disabled_summary" msgid="8737797364522502351">"No disponible porque el NFC está desactivado"</string>
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
     <string name="android_beam_explained" msgid="5684416131846701256">"Si esta función está activada, puedes compartir contenido de las aplicaciones con otro dispositivo mediante NFC. Para ello, mantén los dispositivos cerca. Por ejemplo, puedes compartir páginas web, vídeos de YouTube, contactos y mucho más.\n\nSolo tienes que juntar los dispositivos (normalmente, por la parte de atrás) y tocar la pantalla. La aplicación determina el contenido que se comparte."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidad anónima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Contraseña"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"ID de contraseña SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar contraseña"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Seleccionar banda de AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automática"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartiendo Wi‑Fi con este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Compartir punto de red Wi‑Fi"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifica que eres tú"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Demuestra que eres tú"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"No se desactivará nunca automáticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se desactivará automáticamente al amanecer"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"El tema oscuro utiliza un negro puro para que la batería dure más. Si lo programas, se esperará a que la pantalla se apague para activarse."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"El tema oscuro utiliza un fondo negro en algunas pantallas para que la batería dure más. Si lo programas, se activará después de que apagues la pantalla."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tiempo de espera para suspender la pantalla"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Para usar la huella, añade un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por seguridad, establece un patrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Vuelve a introducir tu contraseña"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Escribe tu contraseña del trabajo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirma el patrón"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Dibuja tu patrón del trabajo"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Vuelve a introducir tu PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Introduce tu PIN del trabajo"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Las contraseñas no coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Los números PIN no coinciden"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Dibuja tu patrón de nuevo"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"El lector de pantalla está destinado principalmente a personas ciegas y con problemas de visión"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca cualquier elemento de la pantalla para escucharlo"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliar"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Ampliar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar el mando de movimientos"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostrar un mando similar a un joystick para mover el área de ampliación"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Ajustes de ampliación"</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">"Ampliar con atajo"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Amplía con una combinación de teclas y tres toques"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Información sobre Ampliar"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opciones"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ampliar la pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Toca tres veces para hacer zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botón para ampliar"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selecciona una tarjeta SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Naranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violeta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"No se ha insertado ninguna tarjeta SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Estado de la SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Estado de la SIM (ranura SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 habilitada</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestar"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recibir notificaciones solo de personas y aplicaciones importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupciones"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar el modo No molestar"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Excepciones"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear interrupciones visuales"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir señales visuales"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Cuando el modo No molestar esté activado"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupciones que reproduzcan sonido"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringir notificaciones"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificaciones sin sonido"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Las notificaciones aparecerán en la pantalla"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Silenciar el dispositivo, pero permitir excepciones"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Excepciones"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programación"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ver todas las excepciones"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Excepciones si el modo No molestar está activado"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplicaciones"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmas y otras interrupciones"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Horarios"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificaciones silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Cuando el modo No molestar esté activado, el sonido y la vibración se silenciarán, excepto en los casos que permitas arriba."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Silenciar todo excepto"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Silenciados"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversaciones"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensajes"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para que el dispositivo suene al recibir los mensajes permitidos, comprueba si tiene activado el sonido, la vibración o el modo silencio."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nada"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"No permitir ninguna llamada"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"No permitir ningún mensaje"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmas"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De temporizadores, alarmas, sistemas de seguridad y otras aplicaciones"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmas"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproducir sonidos multimedia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sonidos multimedia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, juegos y otro tipo de contenido multimedia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multimedia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir sonidos táctiles"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sonidos al tocar"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Del teclado y otros botones"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sonidos al tocar"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir recordatorios"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Recordatorios"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tareas y recordatorios"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"recordatorios"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De futuros eventos del calendario"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que las aplicaciones anulen el modo No molestar"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Excepciones de aplicaciones"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Mostrar sobre otras aplicaciones"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir mostrar sobre otras aplicaciones"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permite que esta aplicación se muestre sobre otras aplicaciones que estés utilizando. Esto puede interferir en el uso de dichas aplicaciones o cambiar el modo en el que se muestran o se comportan."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acceso a todos los archivos"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Dar acceso para gestionar todos los archivos"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permitir que esta aplicación lea, modifique y elimine todos los archivos de este dispositivo o de cualquier volumen de almacenamiento conectado. Si le das permiso, podrá acceder a archivos sin que lo sepas."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Puede acceder a todos los archivos"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realidad virtual procesador estéreo servicio ayuda"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Mostrar sobre otras apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones que se pueden mostrar sobre otras"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 856ab0e..6a1ad6f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privaatsus"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Administraatori keelatud"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Pole saadaval"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Turvalisuse olek"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekraanilukk, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekraanilukk, sõrmejälg"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Face Unlocki kasutamisel rakendustes nõutakse alati kinnitustoimingut"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Kustuta näoandmed"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Funktsiooni Face Unlock seadistamine"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Kasutage Face Unlocki oma seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks.\n\nTasub teada:\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees ja teie silmad on avatud.\n\nVõib juhtuda, et teiega sarnane inimene, näiteks teie laps või identne vend/õde, saab teie telefoni avada."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Kasutage Face Unlocki oma seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks.\n\nTasub teada.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees.\n\nVõib juhtuda, et teiega väga sarnane inimene, näiteks teie kaksikvend/-õde, saab teie telefoni avada."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Kasutage Face Unlocki oma seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks.\n\nTasub teada.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees. Seda isegi siis, kui teie silmad on suletud.\n\nTelefoni saab avada teiega sarnane inimene, nt teie identne vend/õde."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Kas soovite näoandmed kustutada?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlocki kasutatavad näoandmed kustutatakse jäädavalt ja turvaliselt. Pärast eemaldamist vajate telefoni avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks PIN-koodi, mustrit või parooli."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonüümne identiteet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Parool"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE parooli identifikaator"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Kuva parool"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP-riba valimine"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automaatne"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"WiFi-võrgu jagamine selle seadmega …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Ühendamine …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Kuumkoha jagamine"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Kinnitage oma isik"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Kinnitage, et see olete teie"</string>
     <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" msgid="1707702705345670370">"Luba levialas selle võrguga ühendamine"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Lisa seade"</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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ei lülitu kunagi automaatselt välja"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Lülitub automaatselt välja päikesetõusul"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tume teema kasutab tõeliselt musta värvi, et teie aku kestaks kauem. Tumeda teema ajakava lülitatakse sisse siis, kui ekraan on väljas."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tume teema kasutab musta tausta, et teie aku kestaks mõne ekraani puhul kauem. Tumeda teema ajakava lülitatakse sisse siis, kui ekraan on väljas."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekraani ajalõpp"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Turvalisuse huvides määrake muster"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Sisestage oma parool uuesti"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Sisestage tööprofiili parool"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Mustri kinnitamine"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Sisestage tööprofiili muster"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Sisestage oma PIN-kood uuesti"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Sisestage tööprofiili PIN-kood"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Paroolid ei ühti"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-koodid ei ühti"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Joonistage oma muster uuesti"</string>
@@ -1786,7 +1790,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Sama mis seadme ekraanilukk"</string>
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"Installitud rakenduste haldamine ja eemaldamine"</string>
-    <string name="applications_settings" msgid="1941993743933425622">"Rakenduste teave"</string>
+    <string name="applications_settings" msgid="1941993743933425622">"Rakenduse teave"</string>
     <string name="applications_settings_summary" msgid="8206066893744768531">"Rakenduste haldamine, kiirkäivituse otseteede seadistamine"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="3921609656584369901">"Tundmatud allikad"</string>
@@ -1798,7 +1802,7 @@
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"Teie seade ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate seadme kõigi kahjude ja andmekao eest, mis võivad selliste rakenduste kasutamisest tuleneda."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Täpsemad seaded"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Luba rohkem seadete valikuid"</string>
-    <string name="application_info_label" msgid="1015706497694165866">"Rakenduste teave"</string>
+    <string name="application_info_label" msgid="1015706497694165866">"Rakenduse teave"</string>
     <string name="storage_label" msgid="2522307545547515733">"Mäluruum"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"Avamine vaikimisi"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"Vaikeseaded"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Peamiselt pimedatele ja halva nägemisega inimestele mõeldud ekraanilugeja"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Ekraanil olevate üksuste ettelugemise kuulmiseks puudutage neid"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtiitrite eelistused"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurendus"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Suurendamine"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurendusala"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Kuva teisaldamise juhtseade"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Kuva suurendusala teisaldamisel juhtpuldile sarnanev juhtseade"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Suurendamise seaded"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Otsetee ja kolmikpuudutusega suurendamine"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Teave suurendamise kohta"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Valikud"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Suumige ekraanil sisse"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Suumimiseks puudutage kolm korda"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Suumimiseks puudutage nuppu"</string>
@@ -2449,7 +2455,7 @@
     <string name="usage_type_computed_power" msgid="5191902025833668752">"Arvutatud energiatarbimine"</string>
     <string name="usage_type_actual_power" msgid="1221358930299037926">"Tuvastatud energiatarbimine"</string>
     <string name="battery_action_stop" msgid="6998228610098034316">"Sunni peatuma"</string>
-    <string name="battery_action_app_details" msgid="7201369216798227707">"Rakenduste teave"</string>
+    <string name="battery_action_app_details" msgid="7201369216798227707">"Rakenduse teave"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Rakenduse seaded"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Ekraani seaded"</string>
     <string name="battery_action_wifi" msgid="1829212604573932607">"WiFi-seaded"</string>
@@ -2717,7 +2723,7 @@
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"Mobiilne andmeside, WiFi"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
     <string name="data_usage_app" msgid="6367974637783240699">"Rakenduse kasutamine"</string>
-    <string name="data_usage_app_info_label" msgid="3542220416056122841">"RAKENDUSTE TEAVE"</string>
+    <string name="data_usage_app_info_label" msgid="3542220416056122841">"RAKENDUSE TEAVE"</string>
     <string name="data_usage_cellular_data" msgid="1917226172511825849">"Mobiilne andmeside"</string>
     <string name="data_usage_data_limit" msgid="1120291692444009289">"Andmemahupiirangu määramine"</string>
     <string name="data_usage_cycle" msgid="6875568429140150029">"Andmete kasutamistsükkel"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM-kaardi valimine"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranž"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lilla"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Roosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Ühtegi SIM-kaarti pole sisestatud"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-kaardi olek"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-kaardi olek (SIM-kaardi pesa %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 on lubatud</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Valiku Mitte segada sisselülitamine"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Erandid"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Visuaalsete häirimiste blok."</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Luba visuaalsed signaalid"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kui funktsioon Mitte segada on sisse lülitatud"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Luba helimärguandega katkestused"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Märguannete piiramine"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Hääletud märguanded"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Näete ekraanil märguandeid"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Vaigista seade, kuid luba erandid"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Erandid"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ajakava"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Kuva kõik erandid"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Erandid, kui funktsioon Mitte segada on sisse lülitatud"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Inimesed"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Rakendused"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmid ja muud katkestused"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Ajakavad"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Vaigistatud märguanded"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse heli ja vibreerimine (v.a ülal lubatud üksuste puhul)."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Vaigista kõik, v.a"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Vaigistatud"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Vestlused"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Luba sõnumid"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Selleks et lubatud sõnumite puhul telefon heliseks, kontrollige, kas seadmes on aktiveeritud helisemis-, vibreerimis- või vaikne režiim."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Mitte kelleltki"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ära luba kõnesid"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ära luba ühtki sõnumit"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Luba märguanded"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Äratused"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Taimeritelt, alarmidelt, turvasüsteemidelt ja muudelt rakendustelt"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"äratused"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Esita meedia helisid"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Meediahelid"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Videotelt, mängudelt ja muult meedialt"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"meedia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Luba puutehelid"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Puutehelid"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Teie klaviatuurilt ja muudelt nuppudelt"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"puutehelid"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Luba meeldetuletused"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Meeldetuletused"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Ülesannetelt ja meeldetuletustelt"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"meeldetuletused"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Luba sündmused"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Sündmused"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Tulevastelt kalendrisündmustelt"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Luba rakendustel alistada"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Rakenduse erandid"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Muude rakenduste peal kuvamine"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Luba muude rakenduste peal kuvamine"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Lubage see rakendus kuvada muude kasutatavate rakenduste peal. See võib häirida nende rakenduste kasutamist või muuta nende käitumist või kuvamisviisi."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Juurdepääs kõikidele failidele"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Juurdepääsu andmine kõigi failide haldamiseks"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Sellel rakendusel lubatakse lugeda, muuta ja kustutada kõiki selles seadmes ning ühendatud andmekandjatel olevaid faile. Loa andmisel võib rakendus failidele juurde pääseda ilma teie teadmata."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pääseb failidele juurde"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtuaalreaalne kuulaja stereo abiline teenus"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Muude rakenduste peal kuvamine"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> rakendusel <xliff:g id="COUNT_1">%2$d</xliff:g>-st on lubatud muude rakenduste peal kuvada"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0d648be..2764236 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Pribatutasuna"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Administratzaileak desgaitu du"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ez dago erabilgarri"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Segurtasunaren egoera"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Pantailaren blokeoa, aurpegiaren bidez desblokeatzea"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Pantailaren blokeoa, hatz-marka"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Aplikazioetan aurpegiaren bidez desblokeatzeko aukera erabiltzean, eskatu beti berresteko"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ezabatu aurpegiari buruzko datuak"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfiguratu aurpegiaren bidez desblokeatzeko aukera"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Erabili aurpegiaren bidez desblokeatzeko aukera gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko.\n\nGogoan izan:\ntelefonoari begiratuz gero, desblokeatu egin liteke, horretarako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea lezake telefonoa, begiak irekita dituzula zuri begira jartzen badu.\n\nZure antz handia duen norbaitek ere desblokea lezake telefonoa; esate baterako, bikiek."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Erabili aurpegiaren bidez desblokeatzeko eginbidea gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko.\n\nGogoan izan:\ntelefonoari begiratuz gero, desblokeatu egin daiteke, halako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea dezake telefonoa zuri begira jartzen badu.\n\nZure antz handia dutenek ere desblokea dezakete telefonoa; esate baterako, bikiek."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Erabili aurpegiaren bidez desblokeatzeko eginbidea gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko.\n\nGogoan izan:\ntelefonoari begiratuz gero, desblokeatu egin daiteke, halako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea dezake telefonoa zuri begira jartzen badu, baita begiak itxita badituzu ere.\n\nZure antz handia dutenek ere desblokea dezakete telefonoa; esate baterako, bikiek."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Aurpegiari buruzko datuak ezabatu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Aurpegiaren bidez desblokeatzeko eginbideak erabiltzen dituen aurpegiari buruzko datuak behin betiko ezabatuko dira modu seguruan. Horren ondoren, PIN kodea, eredua edo pasahitza beharko duzu telefonoa desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitatea"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identitate anonimoa"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Pasahitza"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE pasahitz-identifikatzailea"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Erakutsi pasahitza"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Hautatu AP banda"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatikoa"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Gailu honekin wifi-konexioa partekatzen…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Konektatzen…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partekatu sare publikoa"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Egiaztatu zu zarela"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Egiaztatu zeu zarela"</string>
     <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">"Sare publikoaren 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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ez da desaktibatuko inoiz automatikoki"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Egunsentian desaktibatuko da automatikoki"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Gai ilunak benetako beltza erabiltzen du bateriak gehiago iraun dezan. Gai ilunaren ordutegiak ez dira aktibatzen pantaila itzaltzen den arte."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Gai ilunak atzeko plano beltza erabiltzen du bateriak gehiago iraun dezan pantaila batzuetan. Gai ilunaren ordutegiak ez dira aktibatzen pantaila itzaltzen den arte."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Pantailaren denbora-muga"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Babestuta egoteko, ezarri eredu bat"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Idatzi berriro pasahitza"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Idatzi pasahitza"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Berretsi eredua"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Idatzi laneko eredua"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Idatzi berriro PIN kodea"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Idatzi laneko PIN kodea"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Pasahitzak ez datoz bat"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN kodeak ez datoz bat"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Marraztu berriro eredua"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Pantaila-irakurgailua, ikusmen-arazoak dituztenentzat"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Sakatu pantailako elementuak eta zer diren entzungo duzu"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Azpitituluen hobespenak"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Lupa"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Ikusi lupaz"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Handitutako zatia"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Erakutsi mugimenduen kontrolagailua"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Erakutsi joystick erako kontrolagailu bat handitu beharreko zatia mugitzeko"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Handitzeko aukeraren ezarpenak"</string>
+    <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Luparen ezarpenak"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Lupa aplikatzeko, sakatu hiru aldiz"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Aplikatu lupa lasterbidearekin"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Aplikatu lupa lasterbidearekin / hiru ukitutxorekin"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Lupari buruz"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Aukerak"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Handitu pantaila"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Zooma aplikatzeko, sakatu hirutan"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zooma aplikatzeko, sakatu botoi bat"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Hautatu SIM txartela"</string>
     <string name="color_orange" msgid="216547825489739010">"Laranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Morea"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Arrosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Ez dago SIM txartelik sartuta"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIMaren egoera"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIMaren egoera (%1$d. SIM zirrikitua)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 gaituta</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Jaso soilik jende eta aplikazio garrantzitsuen jakinarazpenak"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Mugatu etenaldiak"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktibatu ez molestatzeko modua"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Salbuespenak"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokeatu oztopo bisualak"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Baimendu seinale bisualak"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Ez molestatzeko modua aktibatuta dagoenean"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Baimendu soinua duten etenaldiak"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Murriztu jakinarazpenak"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Jakinarazpenak ikusiko dituzu pantailan"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Desaktibatu gailuaren audioa, baina onartu salbuespenak"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Salbuespenak"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programazioa"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ikusi salbuespen guztiak"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Ez molestatzeko modua aktibatuta dagoeneko salbuespenak"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Jendea"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikazioak"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmak eta bestelako etenaldiak"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Ordutegiak"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Isilarazitako jakinarazpenak"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Ez molestatzeko modua aktibatuta dagoenean, audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Desaktibatu guztien audioa eta dardara, hauena izan ezik:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Audioa eta dardara desaktibatuta"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">Beste bat</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Elkarrizketak"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Baimendu mezuak"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Onartutako mezuak jasotzean soinua entzuten dela bermatzeko, egiaztatu gailua tonua jotzeko, dar-dar egiteko edo isilik egoteko ezarrita dagoen."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Bat ere ez"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ez baimendu deiak"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ez onartu inolako mezurik"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Baimendu alarmak"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmak"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Tenporizadore, alarma, segurtasun-sistema eta bestelako aplikazioetatik"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmak"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Erreproduzitu multimedia-edukien soinuak"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Multimedia-soinuak"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Bideo, joko eta bestelako multimedia-fitxategietatik"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multimedia-edukia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Baimendu ukipen-soinuak"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sakatze-soinuak"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Teklatutik eta bestelako botoietatik"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sakatze-soinuak"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Baimendu abisuak"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Abisuak"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Zeregin eta abisuetatik"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"abisuak"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Baimendu gertaerak"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Gertaerak"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Datozen egunetarako egutegiko gertaeretatik"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Eman \"Ez molestatu\" ez aplikatzeko baimena aplikazioei"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Gehitu salbuespenak"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Beste aplikazioen gainean bistaratzea"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Baimendu beste aplikazioen gainean bistaratzea"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Baimendu aplikazioari erabiltzen ari zaren aplikazioen gainean agertzea. Eginbide honek abian diren aplikazioen erabilera oztopa dezake, edo haien itxura edo portaera aldatu."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Fitxategi orotarako sarbidea"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Eman fitxategi guztiak kudeatzeko baimena"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Baimendu aplikazio honek gailuko edo konektatutako biltegiratze-unitateetako edozein fitxategi irakurri, aldatu eta ezabatzea. Baimena emanez gero, baliteke aplikazioak fitxategiak atzitzea zuk jakin ez arren."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Fitxategi guztiak atzi ditzake"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"eb errealitate birtuala hautemailea estereoa laguntzailea laguntza zerbitzua"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Bistaratu aplikazioen gainean"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> aplikaziok dute besteen gainean bistaratzeko baimena"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0f1defa..8ee363f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"حریم خصوصی"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"غیرفعال‌شده توسط سرپرست"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"در دسترس نیست"</string>
     <string name="security_status_title" msgid="6958004275337618656">"وضعیت امنیتی"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل صفحه، باز کردن قفل با چهره"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل صفحه، اثر انگشت"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"هنگام استفاده از «بازگشایی با چهره» در برنامه‌ها، همیشه به تأیید نیاز است"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"حذف داده‌های چهره"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"راه‌اندازی بازگشایی با چهره"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"از «بازگشایی با چهره» برای باز کردن قفل دستگاه، ورود به سیستم برنامه‌ها و تأیید پرداخت‌ها استفاده کنید.\n\nبه خاطر بسپارید:\nبا نگاه کردن به تلفن (حتی اگر نخواهید)، ممکن است قفل آن باز شود.\n\nافراد دیگر می‌توانند با نگه‌داشتن آن جلوی صورتتان، وقتی چشمانتان باز است، قفلش را باز کنند.\n\nفرد دیگری که شباهت زیادی به شما دارد - مثلاً خواهر و برادر دوقلو - می‌تواند قفل تلفنتان را باز کند."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"از «بازگشایی با چهره» برای باز کردن قفل دستگاه، ورود به سیستم برنامه‌ها، و تأیید پرداخت‌ها استفاده کنید.\n\nبه‌خاطر بسپارید:\nنگاه کردن به تلفن می‌تواند قفل آن را باز کند، حتی اگر قصد این کار را نداشته باشید.\n\nهر کسی می‌تواند با نگه داشتن تلفن در جلوی صورت شما قفل آن را باز کند.\n\nفردی که شباهت زیادی به شما دارد، مثلاً خواهر یا برادر دوقلو، می‌تواند قفل تلفنتان را باز کند."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"از «بازگشایی با چهره» برای باز کردن قفل دستگاه، ورود به سیستم برنامه‌ها و تأیید پرداخت‌ها استفاده کنید.\n\nبه خاطر بسپارید:\nبا نگاه کردن به تلفن (حتی اگر نخواهید)، ممکن است قفل آن باز شود.\n\nاگر فردی تلفن را جلوی صورت شما بگیرد، ممکن است قفل آن باز شود، حتی اگر چشمانتان بسته باشد.\n\nفرد دیگری که شباهت زیادی به شما دارد - مثلاً خواهر یا برادر دوقلو - می‌تواند قفل تلفن را باز کند."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"داده‌های چهره حذف شود؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"داده‌های چهره که «بازگشایی با چهره» از آن استفاده کرده به‌طور دائم و ایمن حذف می‌شود. پس از حذف، برای باز کردن قفل تلفن، ورود به سیستم برنامه‌ها، و تأیید پرداخت‌ها، به پین، الگو، یا گذرواژه نیاز دارید."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"هویت"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"هویت ناشناس"</string>
     <string name="wifi_password" msgid="1458802324849513755">"گذرواژه"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"‏شناسه گذرواژه SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"نمایش گذرواژه"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"‏انتخاب باند AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"خودکار"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"‏درحال هم‌رسانی Wi‑Fi با این دستگاه…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"درحال اتصال…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"اشتراک‌گذاری نقطه اتصال"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"تأیید کنید این شما هستید"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"تأیید اینکه این فرد شما هستید"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"هرگز به‌طور خودکار خاموش نمی‌شود"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"به‌طور خودکار در طلوع خاموش می‌شود"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"«طرح زمینه تیره» برای حفظ شارژ باتری برای مدتی طولانی‌تر، از رنگ سیاه واقعی استفاده می‌کند. «طرح زمینه تیره» تا زمانی که صفحه خاموش است، زمان انتظاری برای روشن شدن تنظیم می‌کند."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"«طرح زمینه تیره» در برخی صفحه‌ها از پس‌زمینه سیاه استفاده می‌کند تا شارژ باتری برای مدتی طولانی‌تر حفظ شود. «طرح زمینه تیره» تا زمانی که صفحه خاموش است، زمان انتظاری برای روشن شدن تنظیم می‌کند."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"وقفه زمانی صفحه"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> پس از غیرفعال بودن"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"تنظیم پین برای استفاده از اثر انگشت"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"برای امنیت، الگو تنظیم کنید"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"گذرواژه‌ خود را دوباره وارد کنید"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"گذرواژه نمایه کاری را وارد کنید"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"تأیید الگو"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"الگوی نمایه کاری را وارد کنید"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"پین خود را دوباره وارد کنید"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"پین نمایه کاری را وارد کنید"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"گذرواژه‌ها مطابقت ندارند"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"پین ها با یکدیگر مطابقت ندارند"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"الگویتان را دوباره بکشید"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"صفحه‌خوان در وهله اول برای افراد نابینا و کم‌بینا در نظر گرفته شده است"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"روی موارد موجود در صفحه‌تان ضربه بزنید تا بلند خوانده شوند"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"بزرگ‌نمایی"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"بزرگ‌نمایی"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ناحیه بزرگ‌نمایی"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"نمایش کنترل‌کننده جابه‌جایی"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"برای جابه‌جا کردن ناحیه بزرگ‌نمایی، کنترل‌کننده‌ای شبیه به دسته کنترل نمایش می‌دهد"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"تنظیمات بزرگ‌نمایی"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"درشت‌نمایی بااستفاده از میان‌بر و سه ضربه"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"درباره بزرگ‌نمایی"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"گزینه‌ها"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"بزرگ کردن روی صفحه"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"برای بزرگ‌نمایی، ۳ بار ضربه بزنید"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"برای بزرگ‌نمایی، روی دکمه‌ای ضربه بزنید"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"انتخاب سیم‌کارت"</string>
     <string name="color_orange" msgid="216547825489739010">"نارنجی"</string>
     <string name="color_purple" msgid="6603701972079904843">"بنفش"</string>
+    <string name="color_pink" msgid="8596872110888626708">"صورتی"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"هیچ سیم‌کارتی جاگذاری نشده است"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"وضعیت سیم‌کارت"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"‏وضعیت سیم‌کارت (شیار سیم‌کارت %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> مورد فعال شد</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"روشن کردن «مزاحم نشوید»"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"استثناها"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: ‏<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"مسدود کردن مزاحمت‌های بصری"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"مجاز کردن همه سیگنال‌های تصویری"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"وقتی «مزاحم نشوید» روشن است"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"مجاز کردن وقفه‌هایی که صدا ایجاد می‌کنند"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"محدود کردن اعلان‌ها"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"بدون صدای اعلان‌ها"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"اعلان‌ها را روی صفحه‌تان خواهید دید"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"صامت کردن دستگاه، جز در موارد استثنا"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"استثناها"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"زمان‌بندی"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"مشاهده همه استثناها"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"استثناها وقتی «مزاحم نشوید» روشن است"</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_schedule" msgid="2003707171924226212">"زمان‌بندی‌ها"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"اعلان‌های بی‌صداشده"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"وقتی «مزاحم نشوید» روشن باشد، به‌غیراز مواردی که در بالا مجاز می‌کنید، صدا و لرزش صامت می‌شوند."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"صامت کردن همه به‌جز"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"صامت"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"مکالمات"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"اجازه دادن به پیام‌ها"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"برای اینکه ببینید پیام‌های مجاز صدا دارند، ببینید دستگاهتان را برای زنگ زدن، یا حالت بی‌صدا، یا روی لرزش تنظیم کرده‌اید یا نه."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"پیام‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود شده‌اند. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دهید به شما دسترسی داشته باشند، می‌توانید تنظیمات را تغییر دهید."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"خالی"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"عدم‌اجازه به هیچ تماسی"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"هیچ پیامی مجاز نیست"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"مجاز کردن زنگ‌های ساعت"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"هشدارها"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"از زمان‌سنج‌ها، هشدارها، سیستم‌های امنیتی، و دیگر برنامه‌ها"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"هشدارها"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"پخش صداهای رسانه"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"صدای رسانه"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"از ویدیوها، بازی‌ها، و دیگر رسانه‌ها"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"رسانه‌ها"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"مجاز کردن صداهای لمس"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"صداهای لمس"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"از صفحه‌کلید و دیگر دکمه‌ها"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"صداهای لمس"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"مجاز کردن یادآوری‌ها"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"یادآوری‌ها"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"از کارها و یادآوری‌ها"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"یادآوری‌ها"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"مجاز کردن رویدادها"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"رویدادها"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"از رویدادهای تقویم آتی"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"مجاز کردن برنامه‌ها برای لغو"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"برنامه‌های مستثنا"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"نمایش روی سایر برنامه‌ها"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"مجاز کردن نمایش روی سایر برنامه‌ها"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"به برنامه‌‌‌ اجازه می‌دهد روی سایر برنامه‌هایی که درحال استفاده از آنها هستید نشان داده شود. ممکن است این قابلیت در استفاده شما از آن برنامه‌ها تداخل ایجاد کند یا طرز نمایش یا عملکرد آنها را تغییر دهد."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"دسترسی به همه فایل‌ها"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"دسترسی دادن برای مدیریت همه فایل‌ها"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"به این برنامه اجازه می‌دهد همه فایل‌های موجود در این دستگاه یا فضاهای ذخیره‌سازی متصل‌شده به آن را بخواند، تغییر دهد، و حذف کند. اگر این مجوز به برنامه داده شود، ممکن است بدون اطلاع صریح شما به فایل‌ها دسترسی یابد."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"می‌توانند به همه فایل‌ها دسترسی داشته باشند"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"‏vr واقعیت مجازی شنونده استریو یاور خدمات"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"نمایش روی سایر برنامه‌ها"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"برای نمایش روی سایر برنامه‌ها، <xliff:g id="COUNT_0">%1$d</xliff:g> مورد از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه مجاز شده‌اند"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 58694c0..6367979 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Tietosuoja"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Järjestelmänvalvojan estämä"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ei käytettävissä"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Suojaustila"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Näytön lukitus, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Näytön lukitus, sormenjälki"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Vaadi aina vahvistusta, kun lukitus avataan kasvoilla sovelluksissa"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Poista kasvodata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Määritä Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Face Unlockin avulla voit avata laitteesi latauksen, kirjautua sovelluksiin ja vahvistaa maksuja.\n\nPidä mielessä:\nPuhelimen katsominen voi avata sen lukituksen, vaikka et olisi tarkoittanut tehdä niin.\n\nJoku muu voi avata puhelimesi lukituksen, jos hän pitää puhelinta kasvojesi edessä, kun silmäsi ovat auki.\n\nJoku muu voi avata puhelimesi lukituksen, jos hän näyttää sinulta (esim. identtinen kaksosesi)."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Face Unlockin avulla voit avata laitteesi lukituksen, kirjautua sovelluksiin ja vahvistaa maksuja.\n\nPidä mielessä:\nPuhelimen katsominen voi avata sen lukituksen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä.\n\nSinulta näyttävä henkilö (esim. identtinen kaksonen) voi avata puhelimen lukituksen."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Face Unlockin avulla voit avata laitteesi lukituksen, kirjautua sovelluksiin ja vahvistaa maksuja.\n\nPidä mielessä:\nPuhelimen katsominen voi avata sen lukituksen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä, vaikka silmäsi ovat kiinni.\n\nSinulta näyttävä henkilö (esim. identtinen kaksonen) voi avata puhelimen lukituksen."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Poistetaanko kasvodata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlockin käyttämä kasvodata poistetaan pysyvästi ja turvallisesti. Poistamisen jälkeen tarvitset PIN-koodia, kuviota tai salasanaa puhelimen lukituksen avaamiseen, sovelluksiin kirjautumiseen ja maksujen vahvistamiseen."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteetti"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonyymi identiteetti"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Salasana"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-salasanatunniste"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Näytä salasana"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Valitse AP-taajuus"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automaattinen"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Jaetaan Wi-Fi-yhteys tämän laitteen kanssa…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Yhdistetään…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Jaa hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Vahvista henkilöllisyys"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Henkilöllisyyden vahvistaminen"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ei sammu automaattisesti"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sammuu automaattisesti, kun aurinko nousee"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tumman teeman syvä mustan sävy auttaa pidentämään akunkestoa. Tumman teeman aikataulut otetaan käyttöön vasta, kun näyttö on sammutettu."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tumman teeman musta tausta auttaa pidentämään akunkestoa joillain näytöillä. Tumman teeman aikataulut otetaan käyttöön vasta, kun näyttö on sammutettu."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Näytön aikakatkaisu"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Sormenjälki: aseta PIN-koodi"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Aseta kuvio tietoturvan parantamiseksi."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Lisää salasana uudelleen"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Työprofiilin salasanan lisääminen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Vahvista kuvio"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Työprofiilin lisääminen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Anna PIN-koodi uudelleen"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Työprofiilin PIN-koodin lisääminen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Salasanat eivät täsmää"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-koodit eivät täsmää"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Piirrä kuvio uudelleen"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Näytönlukuohjelma ensisijaisesti näkövammaisille ja heikkonäköisille"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Napauta kohteita näytöllä, niin ne luetaan ääneen."</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Tekstitysvalinnat"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurennus"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Suurenna"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurennettava alue"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Näytä liikkeen ohjain"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Näytä ohjainsauvan tapainen ohjain suurennettavan alueen siirtämiseksi"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Asetusten suurentaminen"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Suurenna pikanäppäimellä ja kolmoisnapautuksella."</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Tietoja suurennuksesta"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Asetukset"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Lähennä näkymää."</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Lähennä napauttamalla kolme kertaa."</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zoomaa napauttamalla painiketta."</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Valitse SIM-kortti"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranssi"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violetti"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Vaaleanpunainen"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Laitteessa ei ole SIM-kortteja"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-kortin tila"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-tila (SIM-paikka %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 käytössä</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ota Älä häiritse ‑tila käyttöön"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Poikkeukset"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Estä näkyvät häiriötekijät"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Salli visuaaliset signaalit"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kun älä häiritse -tila on käytössä"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Salli keskeytykset, jotka antavat äänimerkin"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Rajoita ilmoituksia"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ei ilmoitusääniä"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Näet ilmoituksia näytöllä."</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Mykistä laite, mutta salli poikkeukset"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Poikkeukset"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Aikataulu"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Näytä kaikki poikkeukset"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Poikkeukset, kun Älä häiritse -tila on käytössä"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Ihmiset"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Sovellukset"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Hälytykset ja muut keskeytykset"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Aikataulut"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Hiljennetyt ilmoitukset"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Älä häiritse ‑tilassa äänimerkit ja värinä mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Mykistä kaikki paitsi"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Mykistetty"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> muuta</item>
       <item quantity="one">1 muu</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Keskustelut"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Salli viestit"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Varmista sallittujen viestien kuuluminen tarkistamalla, onko laitteen tila soittoääni, värinä vai äänetön."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ei keneltäkään"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Älä salli puheluja"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Älä salli viestejä."</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Salli hälytykset"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Herätykset"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Ajastimista, hälytyksistä, turvajärjestelmistä ja muista sovelluksista"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"herätykset"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Toista median äänet"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Median äänet"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Videoista, peleistä ja muusta mediasta"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Salli kosketusäänet"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Kosketusäänet"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Näppäimistöstä ja muista painikkeista"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"kosketusäänet"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Salli muistutukset"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Muistutukset"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Tehtävistä ja muistutuksista"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"muistutukset"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Salli tapahtumat"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Tapahtumat"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Tulevista kalenteritapahtumista"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Salli ohittaminen sovelluksille"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Lisää poikkeuksia"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Näkyminen muiden päällä"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Salli näyttäminen muiden sovellusten päällä"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Anna sovelluksen näkyä muiden avoimien sovellusten päällä. Se voi häiritä muiden sovellusten käyttöä tai muuttaa niiden ulkoasua tai käyttäytymistä."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Pääsy kaikkiin tiedostoihin"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Salli pääsy tiedostojen ylläpitoa varten"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Salli sovelluksen lukea, muokata ja poistaa kaikkia tiedostoja tällä laitteella ja yhdistetyillä tallennuslaitteilla. Jos sallit tämän, sovelluksella on pääsy tiedostoihin ilman, että sinulle ilmoitetaan asiasta erikseen."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Voi päästä kaikkiin tiedostoihin"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtuaalitodellisuus kuuntelija stereo avustinpalvelu"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Näkyminen muiden päällä"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> sovellusta saa näkyä muiden sovellusten päällä."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ad0ce6b..ab8e1c2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Confidentialité"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Désactivé par l\'administrateur"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Non accessible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"État de la sécurité"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, déverrouillage par reconnaissance du visage"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreintes digitales"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Toujours dem. une confirm. lors du déverr. par rec. faciale dans applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Suppr. donn. visage"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurer le déverr. par reconn. faciale"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Servez-vous du déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nRemarque importante :\nLe fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage alors que vos yeux sont ouverts.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Servez-vous du déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nRemarque importante :\nLe fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Servez-vous du déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nRemarque importante :\nLe fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Supprimer les données du visage?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les données sur les visages utilisées pour le déverrouillage par reconnaissance faciale seront supprimées de manière permanente et sécuritaire. Après la suppression, vous aurez besoin de votre NIP, de votre schéma ou de votre mot de passe pour déverrouiller votre téléphone, vous connecter à des applications et confirmer les paiements."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identité"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonyme"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Mot de passe"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifiant de mot de passe SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Afficher le mot de passe"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Sélectionner la bande du point d\'accès"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Partage du Wi‑Fi avec cet appareil en cours…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connexion en cours…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partager le point d\'accès"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirmer que c\'est bien vous"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Vérifier qu\'il s\'agit bien de vous"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne se désactivera jamais automatiquement"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se désactivera automatiquement au lever du soleil"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Le thème sombre utilise le noir véritable pour aider à prolonger l\'autonomie de votre pile. Si vous êtes en train d\'utiliser votre téléphone au moment où il doit s\'activer, il ne le fera que lorsque l\'écran sera éteint."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Le thème sombre utilise un arrière-plan noir pour aider à prolonger l\'autonomie de votre pile sur certains écrans. Les horaires du thème sombre attendent que votre écran soit éteint pour s\'activer."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Mise en veille de l\'écran"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Pour util. empr. digit., config. NIP"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Pour votre sécurité, définissez un schéma de verrouillage"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Entrez de nouveau votre mot de passe"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Entrez votre mot de passe professionnel"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirmez votre schéma"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Entrez votre schéma profess."</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Entrer de nouveau votre NIP"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Entrez votre NIP professionnel"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Les NIP ne correspondent pas."</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Tracer votre schéma à nouveau"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Le lecteur d\'écran est destiné principalement aux personnes atteintes de cécité et de troubles de la vue"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Touchez les éléments à l\'écran pour les entendre à haute voix"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Agrandissement"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Région d\'agrandissement"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Afficher l\'outil de déplacement"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Montre un outil de contrôle semblable à une manette de jeu pour déplacer la région d\'agrandissement"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Paramètres d\'agrandissement"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Agrandir avec le raccourci et en touchant trois fois"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"À propos de l\'agrandissement"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom avant sur l\'écran"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Touchez trois fois pour zoomer vers l\'avant"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Touchez un bouton pour zoomer"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Sélectionner une carte SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Mauve"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rose"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Aucune carte SIM insérée"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"État de la carte SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"État de la carte SIM (fente SIM n° %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles activées</item>
     </plurals>
     <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 gens et des applications importants"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activer la fonction « Ne pas déranger »"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquer dérangements visuels"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Autoriser les signaux visuels"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quand la fonction Ne pas déranger est activée"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Autoriser les interruptions qui émettent des sons"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restreindre les notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aucun son des notifications"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Vous verrez des notifications sur l\'écran"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Désactiver le son de l\'appareil, mais autoriser les exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Horaire"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Afficher toutes les exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions quand la fonction Ne pas déranger est activée"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes et autres interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Horaires"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notifications désactivées"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Lorsque le mode Ne pas déranger est activé, le son et les vibrations sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Tout désactiver sauf"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Désactivés"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Autoriser les messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Pour vous assurer que les messages autorisés émettent un son, vérifiez si votre appareil est réglé pour sonner, vibrer ou rester silencieux."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Aucun"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne pas autoriser les appels"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne pas autoriser les messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Autoriser les alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Des minuteries, des alarmes, des systèmes de sécurité et d\'autres applications"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Faire jouer les sons des médias"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons des éléments multimédias"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Des vidéos, des jeux et d\'autres éléments multimédias"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"média"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Autoriser les sons des touches"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons des touches"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"De votre clavier et des autres boutons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons des touches"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Autoriser les rappels"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Rappels"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Des tâches et des rappels"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"rappels"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Autoriser les événements"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Événements"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Des événements de l\'agenda à venir"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Autoriser les applications à ignorer le mode Ne pas déranger"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Exceptions des applications"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Afficher par-dessus les autres applications"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Autoriser la superposition d\'applis"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permet à l\'application d\'afficher des éléments dans d\'autres applications, et cela risque de nuire à l\'utilisation de ces dernières ou de modifier leur apparence ou leur comportement."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Accès à tous les fichiers"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Autorisez l\'accès pour gérer tous les fichiers"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Autoriser cette application à lire, à modifier et à supprimer tous les fichiers qui se trouvent sur cet appareil ou sur des volumes de stockage connectés. Si vous accordez cette autorisation, l\'application pourra accéder à des fichiers sans que vous le sachiez."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Peuvent accéder à tous les fichiers"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr réalité virtuelle écouteur service de soutien stéréo"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Afficher par-dessus autres applis"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> sont autorisées à aff. par-dessus autres applis"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 980c5df..5762430 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Confidentialité"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Désactivé par l\'administrateur"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"État de la sécurité"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreinte digitale"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Toujours demander la confirmation pour Face Unlock dans les applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Supprimer les données de reconnaissance faciale"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurer Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nÀ savoir :\nSi vous regardez votre téléphone, vous pouvez le déverrouiller sans le vouloir.\n\nUne autre personne peut également déverrouiller votre téléphone en tenant celui-ci devant votre visage quand vous avez les yeux ouverts.\n\nVotre téléphone peut être déverrouillé par quelqu\'un qui vous ressemble beaucoup, comme votre enfant ou votre jumeau/jumelle."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nÀ savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nUne autre personne peut également le déverrouiller en le tenant devant votre visage.\n\nEnfin, quelqu\'un qui vous ressemble beaucoup, comme votre jumeau/jumelle peut également déverrouiller votre téléphone."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nÀ savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu\'un d\'autre peut également le déverrouiller en le tenant devant votre visage, même si vous avez les yeux fermés.\n\nEnfin, quelqu\'un qui vous ressemble beaucoup, comme votre jumeau/jumelle peut également déverrouiller votre téléphone."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Supprimer les données de reconnaissance faciale ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les données de reconnaissance faciale utilisées par Face Unlock seront supprimées définitivement et ce, en toute sécurité. Vous devrez alors utiliser votre code PIN, votre schéma ou votre mot de passe pour déverrouiller votre téléphone, vous connecter aux applications et confirmer les paiements."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identité"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonyme"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Mot de passe"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifiant du mot de passe SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Afficher le mot de passe"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Sélectionner la bande du point d\'accès"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatique"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Partage du Wi‑Fi avec cet appareil…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connexion…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partager le point d\'accès"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirmer que c\'est bien vous"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Confirmer votre identité"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne jamais désactiver automatiquement"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Désactiver automatiquement au lever du soleil"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Le thème sombre utilise le noir complet pour préserver l\'autonomie de la batterie. Si vous êtes en train d\'utiliser votre téléphone au moment où il doit s\'activer, il ne le fera que lorsque l\'écran sera éteint."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Le thème sombre utilise un fond noir pour préserver l\'autonomie de la batterie sur certains écrans. Si vous êtes en train d\'utiliser votre téléphone au moment où il doit s\'activer, il ne le fera que lorsque l\'écran sera éteint."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Délai de mise en veille de l\'écran"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Définir un code PIN en plus de l\'empreinte"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Pour plus de sécurité, définissez un schéma"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Saisissez de nouveau votre mot de passe"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Saisissez votre mot de passe professionnel"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirmez votre schéma"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Saisissez schéma professionnel"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Saisissez de nouveau votre code"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Saisissez votre code professionnel"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Les codes ne correspondent pas"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Dessinez de nouveau votre schéma"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Le lecteur d\'écran est destiné principalement aux personnes atteintes de cécité ou de troubles de la vue."</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Appuyez sur des éléments à l\'écran pour qu\'ils soient lus à voix haute"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Agrandir"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zone à agrandir"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Afficher une télécommande"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Utilisez une télécommande sous forme de joystick pour déplacer la zone d\'agrandissement"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Paramètres d\'agrandissement"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Agrandir avec un raccourci et trois tapotements"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"À propos de l\'option \"Agrandir\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom avant sur l\'écran"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Appuyer trois fois pour zoomer"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Appuyer sur un bouton pour zoomer"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Sélectionner une carte SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violet"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rose"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Aucune carte SIM insérée."</string>
     <string name="sim_status_title" msgid="6188770698037109774">"État de la carte SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"État carte SIM (emplacement SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planifications activées</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activer le mode \"Ne pas déranger\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceptions"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquer nuisances visuelles"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Autoriser les signaux visuels"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Lorsque le mode Ne pas déranger est activé"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Autoriser les interruptions sonores"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Limiter les notifications"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aucune notification sonore"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Les notifications s\'afficheront à l\'écran"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> planification peut être activée automatiquement</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planifications peuvent être activées automatiquement</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Couper le son de l\'appareil, mais autoriser les exceptions"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceptions"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programme"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Voir toutes les exceptions"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceptions lorsque le mode Ne pas déranger est activé"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes et autres interruptions"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Planifications"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notifications désactivées"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Lorsque le mode Ne pas déranger est activé, le son et le vibreur sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Couper le son pour tout sauf"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Son coupé"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversations"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Autoriser les messages"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Pour vous assurer qu\'un signal sonore est émis pour les messages autorisés, vérifiez quel mode est activé sur votre appareil (sonnerie, vibreur ou silencieux)."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Aucun"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne pas autoriser les appels"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne pas autoriser les messages"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Autoriser les alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Sons des minuteurs, alarmes, systèmes de sécurité et autres applications"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Lire le son des contenus multimédias"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons des contenus multimédias"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Sons des vidéos, jeux et autres contenus multimédias"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"médias"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Autoriser les sons pour les touches"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons des touches"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Sons du clavier et d\'autres boutons"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons des touches"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Autoriser les rappels"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Rappels"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Sons des tâches et rappels"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"rappels"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Autoriser les événements"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Événements"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Sons des événements d\'agenda à venir"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Autoriser des applications à ignorer ce mode"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Exceptions relatives aux applications"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Superposition sur d\'autres applis"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Autoriser la superposition d\'applis"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Autorisez cette application à se superposer aux autres applications que vous utilisez. Cette autorisation peut avoir un impact sur votre utilisation de ces dernières, ou modifier leur apparence ou leur comportement."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Accès à tous les fichiers"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Autoriser accès à tous fichiers et leur gestion"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Autorisez cette application à lire, modifier et supprimer tous les fichiers sur cet appareil ou sur n\'importe quel volume de stockage connecté. Si vous accordez cette autorisation, il est possible que l\'application accède à des fichiers sans que vous le sachiez."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Peut peut accéder à tous les fichiers"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv réalité virtuelle écouteur service de soutien stéréo"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Superposition sur d\'autres applis"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> autorisées à se superposer à d\'autres"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index cb1896a..23e6e89 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Desactivado polo administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Non dispoñible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estado de seguranza"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla e Desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, impresión dixital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ao utilizar o desbloqueo facial en aplicacións, pedir confirmación"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eliminar datos faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos.\n\nTen en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara e tes os ollos abertos.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos.\n\nTen en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos.\n\nTen en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara, aínda que teñas os ollos pechados.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Queres eliminar os datos faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os datos das caras utilizados polo desbloqueo facial eliminaranse de modo permanente e seguro. Tras quitalos, deberás utilizar o teu PIN, padrón ou contrasinal para desbloquear o teléfono, iniciar sesión nas aplicacións e confirmar pagos."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidade anónima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Contrasinal"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador do contrasinal SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar contrasinal"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Seleccionar banda AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automática"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartindo a wifi con este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Compartir zona wifi"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verificar que es ti"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifica a túa identidade"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desactivará automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Desactivarase automaticamente ao amencer"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"O tema escuro utiliza unha cor negra real para que a batería dure máis. As planificacións do tema escuro actívanse cando a pantalla está desactivada."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"O tema escuro utiliza un fondo negro para que a batería dure máis nalgunhas pantallas. As planificacións do tema escuro actívanse cando a pantalla está desactivada."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo de espera da pantalla"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Impresión dixital: PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por cuestións de seguranza, define un padrón"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Volve introducir o teu contrasinal"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Pon o teu contrasinal do traballo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirma o teu padrón"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Pon o teu padrón do traballo"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Volve introducir o teu PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Pon o teu PIN do traballo"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Os contrasinais non coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Os PIN non coinciden"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Volve debuxar o padrón"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"O lector de pantalla está destinado principalmente a persoas cegas e con pouca visión"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca elementos na pantalla para escoitalos en voz alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Ampliar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar controlador de movementos"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostra un controlador similar a unha panca de mando para mover a área de ampliación"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Configuración de ampliación"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ampliar con atallo e tres toques"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Acerca de Ampliar"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcións"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Aumenta o zoom na pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Toca 3 veces para achegar o zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botón para achegar o zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Seleccionar tarxeta SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Laranxa"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violeta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Non hai ningunha tarxeta SIM inserida"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Estado da SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Estado da SIM (rañura da SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 activada</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar modo Non molestar"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Excepcións"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear ruído visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Cando está activado o modo Non molestar"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupcións que emitan son"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restrinxir notificacións"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificacións sen son"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Verás notificacións na pantalla"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Silenciar o dispositivo, pero con excepcións"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Excepcións"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Planificación"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Consultar todas as excepcións"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Excepcións cando está activado o modo Non molestar"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Persoas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacións"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmas e outras interrupcións"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Planificacións"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificacións silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Cando estea activado o modo Non molestar, silenciaranse o son e a vibración, agás nos casos autorizados anteriormente."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Silenciar todo agás"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Silenciados"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversas"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensaxes"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para asegurarte de que as mensaxes permitidas soen, comproba se o dispositivo ten activado o son e a vibración ou se está configurado en silencio."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"De ninguén"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Non permitir ningunha chamada"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Non permitir ningunha mensaxe"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmas"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De temporizadores, alarmas, sistemas de seguranza e outras aplicacións"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmas"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproducir sons multimedia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons multimedia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, videoxogos e outro contido multimedia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"contido multimedia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir sons ao tocar"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons ao tocar"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Do teclado e doutros botóns"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons ao tocar"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir recordatorios"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Recordatorios"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tarefas e recordatorios"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"recordatorios"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De eventos próximos no calendario"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que as aplicacións anulen o modo Non molestar"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Excepcións de aplicacións"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Mostrar sobre outras aplicacións"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir mostrar sobre outras aplicacións"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permite que esta aplicación se mostre enriba doutras aplicacións que estás utilizando. Pode interferir no uso desas aplicacións ou cambiar a forma na que aparecen ou se comportan."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acceso a todos os ficheiros"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Permitir xestionar todos os ficheiros"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permite que esta aplicación lea, modifique e elimine todos os ficheiros deste dispositivo ou de calquera unidade de almacenamento conectada. Se lle dás permiso, a aplicación poderá acceder aos ficheiros sen que se che notifique explicitamente."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Poden acceder a todos os ficheiros"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual axente de escoita estéreo asistente servizo"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Superpoñer sobre aplicacións"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Aplicacións con permiso para superpoñerse a outras: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8fb1850..2e82fcc 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"મારું સ્થાન, સ્ક્રીન અનલૉક, સિમ કાર્ડ લૉક, ક્રિડેન્શ્યલ સ્ટોરેજ લૉક સેટ કરો"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"મારું સ્થાન, સ્ક્રીન અનલૉક, ઓળખપત્ર સ્ટોરેજ લૉક સેટ કરો"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ગોપનીયતા"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ઉપલબ્ધ નથી"</string>
     <string name="security_status_title" msgid="6958004275337618656">"સુરક્ષાની સ્થિતિ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"સ્ક્રીન લૉક, ફેસ અનલૉક"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"સ્ક્રીન લૉક, ફિંગરપ્રિન્ટ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ઍપમાં ફેસ અનલૉકનો ઉપયોગ કરતી વખતે, હંમેશાં કન્ફર્મેશન પગલાં જરૂરી છે"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ચહેરાનો ડેટા ડિલીટ કરો"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ફેસ અનલૉકનું સેટઅપ કરો"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓને કન્ફર્મ કરવા માટે ફેસ અનલૉકનો ઉપયોગ કરો.\n\nધ્યાનમાં રાખો કે:\nજ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ન ધરાવતા હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nતમારી આંખ ખુલ્લી હોય અને જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nતમારો ફોન સાવ તમારા જેવા જ દેખાતા વ્યક્તિ જેમ કે તમારા જેવા જ દેખાતા તમારા ભાઈ કે બહેન અથવા તમારા બાળક દ્વારા પણ સંભવિત રીતે અનલૉક કરવામાં આવી શકે છે."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓને કન્ફર્મ કરવા માટે ફેસ અનલૉકની સુવિધાનો ઉપયોગ કરો.\n\nધ્યાનમાં રાખો કે:\nજ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ધરાવતા ન હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nજો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nઅદ્દલ તમારી જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા પણ ફોન અનલૉક કરવામાં આવી શકે છે."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓને કન્ફર્મ કરવા માટે ફેસ અનલૉકની સુવિધાનો ઉપયોગ કરો.\n\nધ્યાનમાં રાખો કે:\nજ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ધરાવતા ન હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nજો તમારી આંખો બંધ હોય, તો પણ જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nઅદ્દલ તમારી જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા પણ ફોન અનલૉક કરવામાં આવી શકે છે."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ચહેરાનો ડેટા ડિલીટ કરીએ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ફેસ અનલૉકની સુવિધા વડે ઉપયોગમાં લેવાતો ચહેરાનો ડેટા કાયમ માટે અને સુરક્ષિત રીતે ડિલીટ કરવામાં આવશે. આને કાઢી નાખવામાં આવે, તે પછી તમને તમારો ફોન અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓ કન્ફર્મ કરવા માટે તમારા પિન, પૅટર્ન અથવા પાસવર્ડની જરૂર રહેશે."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ઓળખાણ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"અનામ ઓળખાણ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"પાસવર્ડ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE પાસવર્ડ ઓળખકર્તા"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"પાસવર્ડ બતાવો"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP બેન્ડ પસંદ કરો"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"આપમેળે"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"આ ડિવાઇસ સાથે વાઇ-ફાઇ શેર કરી રહ્યાં છીએ…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"કનેક્ટ થઈ રહ્યું છે…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"હૉટસ્પૉટ શેર કરો"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"પોતાની ખાતરી કરો"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"એ તમે જ છો તે ચકાસો"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ક્યારેય ઑટોમૅટિક રીતે બંધ નહીં થાય"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"તમારી બૅટરીને વધુ લાંબો સમય ટકાવી રાખવામાં સહાય કરવા માટે ઘેરી થીમ કાળા રંગનો ઉપયોગ કરે છે. તમારી સ્ક્રીન બંધ ન થાય ત્યાં સુધી ઘેરી થીમના શેડ્યૂલ ચાલુ થવાની રાહ જુએ છે."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"અમુક સ્ક્રીન પર તમારી બૅટરીને વધુ લાંબો સમય ટકાવી રાખવામાં સહાય કરવા માટે ઘેરી થીમ કાળા બૅકગ્રાઉન્ડનો ઉપયોગ કરે છે. તમારી સ્ક્રીન બંધ ન થાય ત્યાં સુધી ઘેરી થીમ શેડ્યૂલ ચાલુ થવાની રાહ જુએ છે."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"સ્ક્રીનનો સમય સમાપ્ત"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"સ્ક્રીન બંધ કરે છે"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"નિષ્ક્રિયતાનાં <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ફિંગરપ્રિન્ટ વાપરવા પિન સેટ કરો"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"સુરક્ષા માટે, પૅટર્ન સેટ કરો"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"તમારા કાર્યાલયનો પાસવર્ડ દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"કાર્યાલયની પૅટર્ન દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"તમારો પિન ફરી દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"તમારા કાર્યાલયનો પિન દાખલ કરો"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"પાસવર્ડ્સ મેળ ખાતા નથી"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"પિન મેળ ખાતા નથી"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"તમારી પૅટર્ન ફરીથી દોરો"</string>
@@ -1822,7 +1826,7 @@
     <string name="external_data_size_label" product="default" msgid="3370825186202856353">"SD કાર્ડ"</string>
     <string name="uninstall_text" msgid="315764653029060126">"અનઇન્સ્ટોલ કરો"</string>
     <string name="uninstall_all_users_text" msgid="5924715251087176474">"બધા વપરાશકર્તાઓ માટે અનઇન્સ્ટોલ કરો"</string>
-    <string name="install_text" msgid="4558333621516996473">"ઇન્સ્ટોલ કરો"</string>
+    <string name="install_text" msgid="4558333621516996473">"ઇન્સ્ટૉલ કરો"</string>
     <string name="disable_text" msgid="5146002260857428005">"અક્ષમ કરો"</string>
     <string name="enable_text" msgid="8570798764647110430">"સક્ષમ કરો"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"સ્ટોરેજ સાફ કરો"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"સ્ક્રીન રીડર મુખ્યત્વે અંધત્વ અને ઓછી દૃષ્ટિવાળા લોકો માટે છે"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"તમારી સ્ક્રીન પરની આઇટમો મોટેથી વંચાઈને સાંભળવા માટે તેમને ટૅપ કરો"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"કૅપ્શનની પસંદગીઓ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"વિસ્તૃતીકરણ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"મોટી કરો"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"વિસ્તૃતીકરણ ક્ષેત્ર"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ખસેડવા સંબંધી નિયંત્રક બતાવો"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"વિસ્તૃતીકરણ ક્ષેત્રને ખસેડવા માટે જૉયસ્ટિક-જેવા નિયંત્રક બતાવો"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"વિસ્તાર સંબંધી સેટિંગ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"શૉર્ટકટ વડે વિસ્તૃત કરો અને ત્રણ વાર ટૅપ કરો"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"સ્ક્રીન મોટી કરવા વિશે"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"વિકલ્પો"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"સ્ક્રીન પર ઝૂમ વધારો"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ઝૂમ કરવા માટે 3 વખત ટૅપ કરો"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ઝૂમ કરવા માટે બટન ટૅપ કરો"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"સિમ કાર્ડ પસંદ કરો"</string>
     <string name="color_orange" msgid="216547825489739010">"નારંગી"</string>
     <string name="color_purple" msgid="6603701972079904843">"જાંબલી"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ગુલાબી"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"કોઈ સિમ કાર્ડ શામેલ કરેલ નથી"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"સિમ સ્થિતિ"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"સિમની સ્થિતિ (સિમ સ્લૉટ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ કર્યું</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ખલેલ પાડશો નહીં ચાલુ કરો"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"અપવાદો"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"દૃશ્ય વિક્ષેપોને બ્લૉક કરો"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"વિઝ્યુઅલ સંકેતોને મંજૂરી આપો"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"જ્યારે ખલેલ પાડશો નહીં મોડ ચાલુ હોય"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"અવાજવાળા વિક્ષેપોને મંજૂરી આપો"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"નોટિફિકેશનને પ્રતિબંધિત કરો"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"નોટિફિકેશનમાં કોઈ સાઉન્ડ નથી"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"તમે તમારી સ્ક્રીન પર નોટિફિકેશન જોઈ શકશો"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"ડિવાઇસને મ્યૂટ કરો પરંતુ અપવાદોની મંજૂરી આપો"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"અપવાદો"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"શેડ્યૂલ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"બધાં અપવાદો જુઓ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"જ્યારે ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે અપવાદો"</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_schedule" msgid="2003707171924226212">"શેડ્યૂલ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"સાઇલેન્ટ કરેલા નોટિફિકેશન"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે અવાજ અને વાઇબ્રેશન મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમોને મંજૂરી આપો તે અપવાદ છે."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"બધા મ્યૂટ કરો, સિવાય કે"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"મ્યૂટ કરેલ છે"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"વાતચીત"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"સંદેશાની મંજૂરી આપો"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"મંજૂર હોય તેવા સંદેશાનો સાઉન્ડ સંભળાય તેની ખાતરી કરવા માટે, તમારું ડિવાઇસ રિંગ, વાઇબ્રેટ કે સાયલન્ટ પર સેટ કરેલું છે તે ચેક કરો."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ માટે આવનારા સંદેશા બ્લૉક કરેલા છે. તમારા મિત્રો, કુટુંબના સભ્યો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને ગોઠવી શકો છો."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"કોઈ નહીં"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"કૉલને મંજૂરી આપશો નહીં"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"કોઈ સંદેશાની મંજૂરી આપશો નહીં"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"અલાર્મને મંજૂરી આપો"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"એલાર્મ્સ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ટાઇમર, અલાર્મ, સુરક્ષા સિસ્ટમ અને અન્ય ઍપથી"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"એલાર્મ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"મીડિયાનો સાઉન્ડ વગાડો"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"મીડિયા સાઉન્ડ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"વીડિયો, ગેમ અને અન્ય મીડિયાથી"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"મીડિયા"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"સ્પર્શ કરવાથી થતાં સાઉન્ડને મંજૂરી આપો"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ટચ સાઉન્ડ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"તમારા કીબોર્ડ અને અન્ય બટનથી"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ટચ સાઉન્ડ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"રિમાઇન્ડરને મંજૂરી આપો"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"રિમાઇન્ડર"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"કાર્યો અને રીમાઇન્ડરથી"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"રિમાઇન્ડર"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ઇવેન્ટને મંજૂરી આપો"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ઇવેન્ટ્સ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"આગામી કૅલેન્ડર ઇવેન્ટથી"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"અ‍ૅપને ઓવરરાઇડ કરવાની મંજૂરી આપો"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ઍપના અપવાદો"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"અન્ય ઍપથી ઉપર બતાવો"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"અન્ય ઍપ્સની ટોચે પ્રદર્શિત કરવાની મંજૂરી આપો"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"આ ઍપ્લિકેશનને તમે ઉપયોગ કરી રહ્યા હોય તેવી અન્ય ઍપ્લિકેશનોમાં સૌથી ઉપર પ્રદર્શિત કરવા માટેની મંજૂરી આપો. તે કદાચ તમારા તે ઍપ્લિકેશનોના ઉપયોગમાં દખલ કરી શકે છે અથવા તેઓ જે રીતે દેખાય અથવા કામ કરે છે તેમાં ફેરફાર કરી શકે છે."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"બધી ફાઇલોનો ઍક્સેસ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"બધી ફાઇલોને મેનેજ કરવા ઍક્સેસની મંજૂરી આપો"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"આ ઍપને આ ડિવાઇસ અથવા કોઈપણ કનેક્ટેડ સ્ટોરેજ વૉલ્યૂમ પરની બધી ફાઇલો વાંચવા, ફેરફાર કરવા અને ડિલીટ કરવાની મંજૂરી આપો. જો મંજૂરી આપવામાં આવે, તો ઍપ તમને જાણ કર્યા વિના ફાઇલોને ઍક્સેસ કરી શકે છે."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"બધી ફાઇલો ઍક્સેસ કરી શકે છે"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr વર્ચ્યુઅલ રિયાલિટી સાંભળનાર સ્ટીરિયો સહાયક સેવા"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"અન્ય ઍપથી ઉપર બતાવો"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> ઍપ્સને અન્ય ઍપ્સની ટોચે પ્રદર્શિત થવાની મંજૂરી છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f406b12..f5b62c1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"मेरी जगह, स्‍क्रीन का लॉक खोलना, सिम कार्ड लॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"मेरा स्‍थान, स्‍क्रीन अनलॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"निजता"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"व्यवस्थापक ने अक्षम किया है"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"उपलब्ध नहीं है"</string>
     <string name="security_status_title" msgid="6958004275337618656">"सुरक्षा स्थिति"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्‍क्रीन लॉक करने, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फ़िंगरप्रिंट"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ऐप में \'मालिक का चेहरा पहचानकर अनलॉक करना\' का इस्तेमाल करते समय हमेशा पुष्टि करना ज़रूरी है"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"चेहरे का डेटा मिटाएं"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\'चेहरा पहचानकर अनलॉक करना\' सेट अप करें"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"अपना डिवाइस अनलॉक करने के लिए, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा इस्तेमाल करें. ऐप्लिकेशन में साइन इन करें और भुगतानाें की पुष्टि करें.\n\nये बातें ध्यान रखें:\nफ़ोन की ओर देखने पर वह अनलॉक हो जाएगा, भले ही आप ऐसा न करना चाहते हों.\n\nआपकी आंखें खुली होने पर कोई और भी आपके फ़ोन को आपके चेहरे की ओर दिखाकर अनलॉक कर सकता है.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसकी शक्ल आपसे काफ़ी मिलती हो, जैसे कोई जुड़वा भाई-बहन."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"अपने डिवाइस को अनलॉक करने के लिए, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा का इस्तेमाल करें. इसका इस्तेमाल, ऐप्लिकेशन में साइन इन करने और पैसे चुकाने की पुष्टि के लिए भी किया जा सकता है.\n\nध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी फ़ोन अनलॉक हो सकता है.\n\nआपका फ़ोन, आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे काफ़ी मिलता हो, जैसे कि जुड़वां भाई या बहन."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"अपने डिवाइस को अनलॉक करने, ऐप्लिकेशन में साइन इन करने, और भुगतानों की पुष्टि करने के लिए आप मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा का इस्तेमाल कर सकते हैं.\n\nध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी आपका फ़ोन अनलॉक हो सकता है.\n\nआपका फ़ोन आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है, भले ही आपकी आंखें बंद क्यों न हों.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे मिलता-जुलता हो, जैसे कि कोई जुड़वां भाई-बहन."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"चेहरे का डेटा मिटाएं?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"मालिक का चेहरा पहचानकर अनलॉक करने वाली सुविधा के लिए इस्तेमाल किया जाने वाला चेहरे का डेटा, सुरक्षित तरीके से हमेशा के लिए मिटा दिया जाएगा. इसके बाद, फ़ोन अनलॉक करने, ऐप्लिकेशन में साइन इन करने, और पैसे चुकाने की पुष्टि करने के लिए आपको पिन, पैटर्न या पासवर्ड की ज़रूरत होगी."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"पहचान"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"अनाम पहचान"</string>
     <string name="wifi_password" msgid="1458802324849513755">"पासवर्ड"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE पासवर्ड पहचानकर्ता"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"पासवर्ड दिखाएं"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP बैंड चुनें"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"अपने आप"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"इस डिवाइस के साथ वाई-फ़ाई शेयर किया जा रहा है…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"कनेक्ट हो रहा है…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"हॉटस्पॉट शेयर करें"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"अपनी पहचान की पुष्टि करें"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"पुष्टि करें कि यह आप ही हैं"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"चालू है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"कभी भी अपने-आप बंद नहीं होगा"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सुबह होने पर अपने-आप बंद हो जाएगा"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"गहरे रंग वाली थीम चालू होने पर सही कंट्रास्ट वाली काली स्क्रीन दिखने लगती है. इससे आपकी बैटरी ज़्यादा देर तक चलती है. यह थीम तभी चालू होती है, जब स्क्रीन की लाइट बंद हो जाती है."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"गहरे रंग वाली थीम चालू हाेने पर, स्क्रीन का बैकग्राउंड काला हो जाता है. इससे कुछ डिवाइस पर बैटरी ज़्यादा देर तक चलती है. यह थीम तब चालू होती है, जब स्क्रीन की लाइट बंद हो जाती है."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रीन इतनी देर में बंद हो जाएगी"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> तक इस्तेमाल न होने पर"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"फ़िंगरप्रिंट का उपयोग करने के लिए, पिन सेट करें"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"सुरक्षा के लिए पैटर्न सेट करें"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"पासवर्ड फिर से डालें"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"अपनी वर्क प्रोफ़ाइल का पासवर्ड डालें"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"अपने पैटर्न की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"वर्क प्रोफ़ाइल का पैटर्न डालें"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"पिन फिर से डालें"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"अपनी वर्क प्रोफ़ाइल का पिन डालें"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"पिन मेल नहीं खाते"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"अपना पैटर्न फिर से बनाएं"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"स्क्रीन रीडर खास तौर पर दृष्टिहीन और कमज़ोर नज़र वाले लोगों के लिए है"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"अपनी स्क्रीन पर दिए गए आइटम तेज़ आवाज़ में सुनने के लिए उन्हें टैप करें"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कैप्शन की प्राथमिकताएं"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"बड़ा करना"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"स्क्रीन को बड़ा करें"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"स्क्रीन का बड़ा किया गया हिस्सा"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"मूव कंट्रोलर दिखाएं"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"जिस हिस्से को बड़ा किया गया है उसे यहां से वहां ले जाने के लिए जॉयस्टिक जैसा कंट्रोलर दिखाएं"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"स्क्रीन को बड़ा करने की सेटिंग"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"तीन बार टैप और शॉर्टकट की मदद से बड़ा करके देखें"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"स्क्रीन बड़ी करने के बारे में जानें"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"विकल्प"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"स्क्रीन पर ज़ूम इन करें"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ज़ूम करने के लिए तीन बार टैप करें"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"सिम कार्ड चुनें"</string>
     <string name="color_orange" msgid="216547825489739010">"नारंगी"</string>
     <string name="color_purple" msgid="6603701972079904843">"बैंगनी"</string>
+    <string name="color_pink" msgid="8596872110888626708">"गुलाबी"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"कोई सिम कार्ड नहीं डाला गया"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"सिम स्थिति"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"सिम की स्थिति (सिम डालने की जगह %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियम चालू हो गए</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'परेशान न करें\' चालू करें"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"अपवाद"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"मैसेज पर स्क्रीन चमकने से रोकें"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"संकेत दिखाए जाने की अनुमति दें"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"\'परेशान न करें\' के चालू होने पर"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"उन सूचनाओं की अनुमति दें जिनके लिए आवाज़ होती है"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"सूचनाओं पर रोक लगाएं"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"सूचनाएं आने पर कोई आवाज़ सुनाई न दे"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"अगर आप यह सेटिंग चुनते हैं तो, आपको डिवाइस की स्क्रीन पर सूचनाएं दिखाई देंगी"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"डिवाइस म्यूट करें, लेकिन अपवादों की मंज़ूरी दें"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"अपवाद"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"तय किया गया समय"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"सभी अपवाद देखें"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"\'परेशान न करें\' मोड चालू होने के बावजूद, ये सुविधाएं काम कर सकती हैं"</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_schedule" msgid="2003707171924226212">"शेड्यूल"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"म्यूट की गई सूचनाएं"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"\'परेशान न करें\' सुविधा चालू होने पर आवाज़ और वाइब्रेशन बंद रहेंगे. हालांकि, जिन चीजों के लिए आपने मंज़ूरी दी है उनके लिए यह सुविधा काम नहीं करेगी."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"इन्हें छोड़कर, बाकी सभी सूचनाओं को म्यूट करें"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"म्यूट किया गया"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"बातचीत"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"मैसेज दिखाने की मंज़ूरी दें"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"जिन मैसेज के आने की अनुमति है, उनके आने पर आवाज़ आए, यह पक्का करने के लिए देखें कि आपका डिवाइस रिंग करने, वाइब्रेट करने या मौन रहने में से किस मोड पर सेट है."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ के लिए आने वाले मैसेज ब्लॉक कर दिए गए हैं. आप सेटिंग में अपने हिसाब से बदलाव करके दोस्तों, परिवार के सदस्यों या दूसरे लोगों को आपसे संपर्क करने की मंज़ूरी दे सकते हैं."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"कोई नहीं"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"किसी भी कॉल की मंज़ूरी न दें"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"किसी भी मैसेज की मंज़ूरी न दें"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"अलार्म की मंज़ूरी दें"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्म"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"टाइमर, अलार्म, सुरक्षा सिस्टम, और अन्य ऐप्लिकेशन की सूचनाएं"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"अलार्म"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"मीडिया की आवाज़ें चलाएं"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"मीडिया साउंड"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"वीडियो, गेम, और अन्य मीडिया की सूचनाएं"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"मीडिया"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"स्क्रीन छूने पर आने वाली आवाज़ की मंज़ूरी दें"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"छूने पर आने वाली आवाज़ें"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"आपके कीबोर्ड और अन्य बटन से आने वाली आवाज़ें"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"स्क्रीन छूने पर आने वाली आवाज़"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"रिमाइंडर की मंज़ूरी दें"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"रिमाइंडर"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"टास्क और रिमाइंडर की सूचनाएं"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"रिमाइंडर"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"इवेंट की मंज़ूरी दें"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"इवेंट"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"आने वाले कैलेंडर इवेंट की सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ऐप्लिकेशन को ओवरराइड करने की मंज़ूरी दें"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ऐप्लिकेशन के अपवाद"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"हमेशा दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"इस ऐप्लिकेशन को अपने उपयोग किए जा रहे दूसरे सभी ऐप्लिकेशन के ऊपर दिखाई देने दें. यह उन ऐप्लिकेशन के आपके उपयोग में दखल दे सकता है या उनके दिखाई देने या व्यवहार करने के तरीके में बदलाव कर सकता है."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"सभी फ़ाइलों का ऐक्सेस है"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"सभी फ़ाइलों को प्रबंधित करने की अनुमति दें"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"इस ऐप्लिकेशन को अनुमति दें, ताकि वह इस डिवाइस और इससे जुड़े स्टोरेज पर मौजूद फ़ाइलों को पढ़ सके, उनमें बदलाव कर सके, और उन्हें मिटा सके. अगर आप अनुमति देते हैं, तो यह ऐप्लिकेशन आपको सूचना दिए बिना फ़ाइलों को ऐक्सेस कर सकता है."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"सभी फ़ाइलें ऐक्सेस कर सकते हैं"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr आभासी वास्तविकता श्रोता स्टीरियो सहायक सेवा"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप को दूसरे ऐप के ऊपर दिखाने की अनुमति है"</string>
@@ -4238,7 +4258,7 @@
     <string name="high_label" msgid="357503396626018487">"ज़्यादा"</string>
     <string name="left_edge" msgid="1513576842959071849">"बायां किनारा"</string>
     <string name="right_edge" msgid="1505309103265829121">"दायां किनारा"</string>
-    <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"सेंसिटिविटी बढ़ाने से हो सकता है कि डिवाइस की स्क्रीन के किनारों पर हाथ के जेस्चर (स्पर्श) ठीक से काम न करें. इस वजह से कुछ ऐप्लिकेशन पर भी असर पड़ सकता है."</string>
+    <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"सेंसिटिविटी बढ़ाने से, ऐप्लिकेशन के लिए इस्तेमाल किए जाने वाले, हाथ के कुछ ऐसे जेस्चर (स्पर्श) पर असर पड़ सकता है जो स्क्रीन के किनारों पर होते हैं."</string>
     <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"बैक सेंसिटिविटी"</string>
     <string name="gesture_settings_activity_title" msgid="6047431928567911330">"हाथ के जेस्चर (स्पर्श) की सेटिंग"</string>
     <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"हाथ के जेस्चर (स्पर्श) वाला नेविगेशन, बैक सेंसिटिविटी, पीछे जाने का जेस्चर"</string>
@@ -4274,7 +4294,7 @@
     <string name="web_action_enable_title" msgid="6654581786741216382">"झटपट ऐप्लिकेशन"</string>
     <string name="web_action_enable_summary" msgid="2658930257777545990">"सभी लिंक ऐप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</string>
     <string name="web_action_section_title" msgid="994717569424234098">"झटपट ऐप्लिकेशन"</string>
-    <string name="instant_apps_settings" msgid="4280942494969957858">"इंस्टेंट ऐप से जुड़ी पसंद की सेटिंग"</string>
+    <string name="instant_apps_settings" msgid="4280942494969957858">"झटपट ऐप्लिकेशन से जुड़ी पसंद की सेटिंग"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a17667e..a63dded 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Onemogućio administrator"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nedostupna"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sigurnosni status"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje zaslona, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje zaslona, otisak prsta"</string>
@@ -374,7 +374,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Za upotrebu otključavanja licem u aplikacijama uvijek traži potvrdu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Briši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Postavite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Pomoću otključavanja licem otključajte uređaj, prijavite se u aplikacije i potvrdite plaćanja.\n\nNe zaboravite:\ngledajući telefon možete ga otključati i kad to ne namjeravate.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu dok su vam oči otvorene.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Značajkom otključavanja licem otključajte uređaj, prijavite se u aplikacije i potvrdite plaćanja.\n\nNe zaboravite:\ngledajući telefon možete ga otključati i kad to ne namjeravate.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Značajkom otključavanja licem otključajte uređaj, prijavite se u aplikacije i potvrdite plaćanja.\n\nNe zaboravite:\ngledajući telefon možete ga otključati i kad to ne namjeravate.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu, čak i ako su vam oči zatvorene.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Želite li izbrisati podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje upotrebljava otključavanje licem trajno će se i sigurno izbrisati. Nakon uklanjanja trebat će vam PIN, uzorak ili zaporka da biste otključali telefon, prijavili se na aplikacije i potvrdili plaćanja."</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anoniman identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Zaporka"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikator zaporke za SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Pokaži zaporku"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Odaberite frekvenciju pristupne točke"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatski"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Dijeljenje Wi-Fija s ovim uređajem…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezivanje…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Dijeljenje žarišne točke"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potvrdite da ste to vi"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potvrdite da ste to vi"</string>
     <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" 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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikad se ne isključuje automatski"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Isključuje se automatski kad sunce izađe"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tamna tema upotrebljava potpuno crnu boju radi produljenja trajanja baterije. Rasporedi s tamnom temom čekaju s uključivanjem dok se zaslon ne isključi."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tamna tema upotrebljava crnu pozadinu radi produljenja trajanja baterije na nekim zaslonima. Rasporedi s tamnom temom čekaju s uključivanjem dok se zaslon ne isključi."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Privremeni prekid rada zaslona"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Kada prođe <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Otisak prsta zahtijeva PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Radi sigurnosti postavite uzorak"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ponovni unos zaporke"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Unesite poslovnu zaporku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potvrdite uzorak"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Unesite poslovni uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ponovni unos PIN-a"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Unesite poslovni PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Zaporke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Ponovo iscrtajte obrazac"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Čitač zaslona namijenjen prvenstveno slijepim i slabovidnim osobama"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Dodirnite stavke na zaslonu da bi ih usluga izgovorila naglas"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povećavanje"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Povećaj"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje povećanja"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Prikaz kontrolera premještanja"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Prikaz kontrolera u obliku upravljačke palice za premještanje područja povećanja"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Postavke povećavanja"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Povećanje pomoću prečaca i trostrukog dodira"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"O opciji Povećaj"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcije"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Povećavanje zaslona"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Dodirnite triput za zumiranje"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite gumb za zumiranje"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Odaberite SIM karticu"</string>
     <string name="color_orange" msgid="216547825489739010">"Narančasta"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ljubičasta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ružičasta"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM kartica nije umetnuta"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status SIM-a"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status SIM-a (utor za SIM %1$d)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="other">Omogućeno je <xliff:g id="ON_COUNT">%d</xliff:g></item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključite opciju Ne uznemiravaj."</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Iznimke"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizualnih ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dopusti vizualne signale"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kad je uključen način Ne uznemiravaj"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Dopusti ometanja koja proizvode zvuk"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ograničavanje obavijesti"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bez zvuka obavijesti"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Vidjet ćete obavijesti na zaslonu"</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Isključi zvuk uređaja, ali dopusti iznimke"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Iznimke"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Raspored"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Pogledajte sve iznimke"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Iznimke kad je uključen način Ne uznemiravaj"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmi i druga ometanja"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Rasporedi"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Utišane obavijesti"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kada je način Ne uznemiravaj uključen, zvučni signali i vibriranje bit će isključeni, osim za prethodno navedene stavke koje dopustite."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Zanemari sve osim"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Zanemareno"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Razgovori"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Dopusti poruke"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Da biste provjerili mogu li se čuti dopuštene poruke, provjerite je li uređaj postavljen na zvonjenje, vibraciju ili nečujno."</string>
     <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>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ništa"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne dopuštaj nijednu vrstu poziva"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne dopuštaj nijednu vrstu poruka"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Dopusti alarme"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"od odbrojavanja, alarma, sigurnosnih sustava i drugih aplikacija"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmi"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproduciraj zvukove medija"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvukovi medija"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"od videozapisa, igara i drugih medija"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"mediji"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Dopusti zvukove dodira"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvukovi dodirivanja"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"od tipkovnice i ostalih gumba"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvukovi dodirivanja"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Dopusti podsjetnike"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Podsjetnici"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"od zadataka i podsjetnika"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"podsjetnici"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Dopusti događaje"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Događaji"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"od skorih događaja kalendara"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Dopusti aplikacijama da nadjačaju"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Iznimke aplikacija"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Prikaz iznad drugih aplikacija"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Dopusti prikaz iznad drugih aplikacija"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Aplikaciji omogućuje da se prikazuje iznad drugih aplikacija koje upotrebljavate. To može ometati upotrebu tih aplikacija ili promijeniti njihov izgled ili ponašanje."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Pristup svim datotekama"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Dopustite pristup za upravljanje svim datot."</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Dopustite ovoj aplikaciji čitanje, izmjenu i brisanje svih datoteka na ovom uređaju ili bilo kojim povezanim uređajima za pohranu. Ako je odobreno, aplikacija može pristupiti datotekama bez vašeg znanja."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Može pristupiti svim datotekama"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr slušatelj virtualne stvarnosti stereo pomoćna usluga"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Prikaz iznad drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Broj aplikacija koje se mogu prikazivati iznad drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fdf2985..502e363 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Adatvédelem"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"A rendszergazda kikapcsolta"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nem hozzáférhető"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Biztonsági állapot"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Képernyőzár, arcalapú feloldás"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Képernyőzár, ujjlenyomat"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Alkalmazáson belüli arcalapú feloldáshoz megerősítés is szükséges"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Arcadatok törlése"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Arcalapú feloldás beállítása"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Az arcalapú feloldás segítségével feloldhatja eszköze zárolását, bejelentkezhet alkalmazásokba, illetve megerősíthet fizetéseket.\n\nNe feledje:\nHa a telefonja felé fordul, azzal akkor is feloldhatja az eszköz zárolását, ha nem áll szándékában.\n\nTelefonját más is feloldhatja, ha az Ön arca elé tartja, amikor a szeme nyitva van.\n\nElőfordulhat, hogy telefonja zárolását egy Önre nagyon hasonlító személy, például egypetéjű ikertestvére is feloldhatja."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Az arcalapú feloldás segítségével feloldhatja eszköze zárolását, bejelentkezhet alkalmazásokba, illetve megerősíthet fizetéseket.\n\nNe feledje:\nA telefonjára nézve akkor is feloldhatja az eszközt, ha nem áll szándékában.\n\nTelefonját más is feloldhatja, ha az Ön arca elé tartja.\n\nElőfordulhat, hogy telefonja zárolását egy Önre nagyon hasonlító személy, például egypetéjű ikertestvére is fel tudja oldani."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Az arcalapú feloldás segítségével feloldhatja eszköze zárolását, bejelentkezhet alkalmazásokba, illetve megerősítheti a fizetéseket.\n\nNe feledje:\nAkaratlanul is feloldhatja a telefont, amikor ránéz.\n\nA telefont mások is feloldhatják, ha az Ön arca elé tartják, még akkor is, ha csukva van a szeme.\n\nElőfordulhat, hogy telefonja zárolását egy Önre nagyon hasonlító személy, például egypetéjű ikertestvére is feloldhatja."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Törli az arcadatokat?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Az arcalapú feloldáshoz használt arcadatokat véglegesen és biztonságosan töröljük. Az eltávolítás után PIN-kódra, mintára vagy jelszóra lesz szüksége a telefon feloldásához, az alkalmazásokba való bejelentkezéshez és a tranzakciók megerősítéséhez."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Azonosság"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Név nélküli identitás"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Jelszó"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE jelszóazonosító"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Jelszó megjelenítése"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP sáv kiválasztása"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatikus"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi megosztása ezzel az eszközzel…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Csatlakozás…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspot megosztása"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Igazolja, hogy Ön az"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Igazolja, hogy Ön az"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Be / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Soha nem kapcsol ki automatikusan"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Automatikusan kikapcsol napkeltekor"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"A Sötét téma valódi fekete színt használ, ezáltal kíméli az akkumulátort. A Sötét téma csak a képernyő kikapcsolása után kapcsol be."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"A Sötét téma fekete hátteret használ, ezáltal kíméli az akkumulátort bizonyos képernyőkön. A Sötét téma csak a képernyő kikapcsolása után kapcsol be."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Képernyő időkorlátja"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN-kód az ujjlenyomathoz"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"A biztonság érdekében állítson be mintát"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Adja meg újra a jelszót"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Adja meg munkahelyi jelszavát"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Erősítse meg a mintát"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Adja meg munkahelyi mintáját"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Adja meg újra a PIN-kódot"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Adja meg munkahelyi PIN-kódját"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"A jelszavak nem egyeznek"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"A PIN-kódok nem egyeznek"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Rajzolja újra a mintát"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Elsődlegesen vakok és gyengénlátók számára készült képernyőolvasó"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Koppintson a képernyőn látható elemekre, ha szeretné őket felolvasva hallani"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Nagyítás"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Nagyítási terület"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mozgató kontroller mutatása"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Joystickszerű kontroller megjelenítése a nagyítási terület mozgatásához"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Nagyítási beállítások"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Nagyítás gyorsparanccsal és három koppintással"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"A nagyításról"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Lehetőségek"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"A képernyő nagyítása"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"A nagyításhoz koppintson háromszor"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Nagyításhoz koppintson a gombra"</string>
@@ -2987,7 +2993,7 @@
     <string name="application_restrictions" msgid="276179173572729205">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Alkalmazásbeállítás megnyitása"</string>
-    <string name="nfc_payment_settings_title" msgid="400718454435230486">"Érintéssel való fizetés"</string>
+    <string name="nfc_payment_settings_title" msgid="400718454435230486">"Érintéses fizetés"</string>
     <string name="nfc_payment_how_it_works" msgid="3658253265242662010">"Hogyan működik?"</string>
     <string name="nfc_payment_no_apps" msgid="6840001883471438798">"Fizessen telefonjával a boltokban"</string>
     <string name="nfc_payment_default" msgid="3769788268378614608">"Fizetéskor alapértelmezett"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM-kártya kiválasztása"</string>
     <string name="color_orange" msgid="216547825489739010">"Narancssárga"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lila"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rózsaszín"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nincs SIM-kártya behelyezve"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-kártya állapota"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM állapota (%1$d. SIM-foglalat)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 engedélyezve</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"A Ne zavarjanak mód bekapcsolása"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Kivételek"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Megjelenő értesítések tiltása"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizuális jelek engedélyezése"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Ha a „Ne zavarjanak” mód aktív"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Hanggal járó jelzések engedélyezése"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Értesítések korlátozása"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Nincs hang az értesítéseknél"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Az értesítések megjelennek a képernyőn"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Eszköz némítása, de kivételek engedélyezve"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Kivételek"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ütemezés"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Összes kivétel megtekintése"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Kivételek, amikor a „Ne zavarjanak” mód aktív"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Személyek"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Alkalmazások"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Ébresztések és további jelzések"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Ütemezések"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Némított értesítések"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Ha a „Ne zavarjanak” mód aktív, akkor a hang és a rezgés némítva lesznek, kivéve a fent engedélyezett elemeket."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Az összes némítása, kivéve a következőket:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Némítva"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Beszélgetések"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Üzenetek engedélyezése"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Ahhoz, hogy az engedélyezett üzenetek hangot adhassanak ki, ellenőrizze, hogy eszköze csörgésre, rezgésre vagy néma módra van-e állítva."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Senkitől"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne engedélyezze a hívásokat"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne engedélyezze az üzeneteket"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Ébresztések engedélyezése"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Riasztások"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Innen: időzítések, ébresztések, biztonsági rendszerek és más alkalmazások"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ébresztések"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Médiahangok lejátszása"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Médiaelemek hangja"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Innen: videók, játékok és egyéb médiaelemek"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"média"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Érintési műveletek hangjainak engedélyezése"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Érintési hangok"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Innen: billentyűzet és más gombok"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"érintési hangok"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Emlékeztetők engedélyezése"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Emlékeztetők"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Innen: teendők és emlékeztetők"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"emlékeztetők"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Események engedélyezése"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Események"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Innen: közelgő naptári események"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Felülbírálás engedélyezése az alkalmazások számára"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Alkalmazáskivételek"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"A többi alkalmazás fölött jelenik meg"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Más alkalmazások fölé helyezés engedélyezése"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Lehetővé teszi az adott alkalmazás számára, hogy megjelenjen a többi használatban lévő alkalmazás fölött. Ezzel esetleg akadályozhatja a többi alkalmazás használatát, vagy megváltoztathatja megjelenésüket, illetve viselkedésüket."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Hozzáférés minden fájlhoz"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Hozzáférés megadása minden fájl kezeléséhez"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Engedélyezi ennek az alkalmazásnak az eszközön és a csatlakoztatott tárolóköteteken található összes fájl olvasását, módosítását és törlését. Ha engedélyezve van, az alkalmazás anélkül férhet hozzá a fájlokhoz, hogy Önt külön tájékoztatná róla."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Minden fájlhoz hozzáférhet"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr, virtuális valóság, figyelő, sztereó, segédszolgáltatás"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"A többi alkalmazás fölött"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"A(z) <xliff:g id="COUNT_1">%2$d</xliff:g> alkalmazásból <xliff:g id="COUNT_0">%1$d</xliff:g> jelenhet meg más alkalmazások fölött"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 74b75a8..20349c3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Գաղտնիություն"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Անջատվել է ադմինիստրատորի կողմից"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Հասանելի չէ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Անվտանգության կարգավիճակը"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Էկրանի կողպում, դեմքով ապակողպում"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Էկրանի կողպում, մատնահետք"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Միշտ հաստատում պահանջել հավելվածներում դեմքով ապակողպման ժամանակ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ջնջել դեմքը"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Կարգավորեք դեմքով ապակողպումը"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"«Դեմքով ապակողպում» գործառույթի միջոցով դուք կարող եք ապակողպել սարքը, մտնել հավելվածներ և հաստատել վճարումները։\n\nՆկատի ունեցեք.\nհեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՁեր հեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ուղղված և ձեր աչքերը բաց են:\n\nՀեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր երեխան, հարազատ եղբայրը կամ քույրը:"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"«Դեմքով ապակողպում» գործառույթի միջոցով դուք կարող եք ապակողպել սարքը, մտնել հավելվածներ և հաստատել վճարումները։\n\nՆկատի ունեցեք.\nհեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՁեր հեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ուղղված:\n\nՀեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր երեխան, հարազատ եղբայրը կամ քույրը:"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"«Դեմքով ապակողպում» գործառույթի միջոցով դուք կարող եք ապակողպել սարքը, մտնել հավելվածներ և հաստատել վճարումները։\n\nՆկատի ունեցեք.\nհեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՁեր հեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ուղղված, նույնիսկ երբ ձեր աչքերը փակ են:\n\nՀեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր երեխան, հարազատ եղբայրը կամ քույրը:"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ջնջե՞լ դեմքի տվյալները"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ապակողպման համար օգտագործվող դեմքի տվյալներն ընդմիշտ կջնջվեն: Դրանից հետո հեռախոսը ապակողպելու, հավելվածներ մուտք գործելու և վճարումներ հաստատելու համար անհրաժեշտ կլինի մուտքագրել PIN կոդը, նախշը կամ գաղտնաբառը։"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Ինքնություն"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Անանուն ինքնություն"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Գաղտնաբառ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE գաղտնաբառի նույնացուցիչ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Ցույց տալ գաղտնաբառը"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Wi-Fi հաճախականությունների դիապազոն"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Ավտոմատ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Սարքը միանում է Wi‑Fi-ին…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Միացում…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Ընդհանուր թեժ կետ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Հաստատեք ձեր ինքնությունը"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Հաստատեք, որ դա դուք եք"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Միացված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ավտոմատ չի անջատվի"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ավտոմատ կանջատվի արևածագին"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Մուգ թեմայում օգտագործվում է սև գույնը՝ մարտկոցի լիցքի տևողությունը երկարացնելու համար: Մուգ թեմայի ժամանակացույցները չեն միանա, մինչև էկրանը չանջատվի։"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Մուգ թեմայում օգտագործվում է սև ֆոն՝ որոշ էկրաններում մարտկոցի լիցքի տևողությունը երկարացնելու համար։ Մուգ թեմայի ժամանակացույցները չեն միանա, մինչև էկրանը չանջատվի։"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Էկրանի անջատում"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Էկրանը անջատվում է"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> անգործուն լինելուց հետո"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Մատնահետքն օգտագործելու համար ընտրեք PIN կոդ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Սարքը պաշտպանելու համար նախշ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Նորից մուտքագրեք գաղտնաբառը"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Մուտքագրեք աշխատանքային հաշվի գաղտնաբառը"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Հաստատեք ձեր կաղապարը"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Նշեք աշխատանքային հաշվի նախշը"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Նորից մուտքագրեք PIN կոդը"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Մուտքագրեք աշխատանքային հաշվի PIN կոդը"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Գաղտնաբառերը չեն համընկնում"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-երը չեն համընկնում"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Նորից նկարեք նախշը"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Էկրանի ընթերցիչը նախատեսված է հիմնականում կույր կամ վատ տեսողություն ունեցող մարդկանց համար"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Հպեք էկրանին ցուցադրվող տարրերին՝ դրանց նկարագրությունը բարձրաձայն լսելու համար"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Ենթագրերի կարգավորումներ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Խոշորացում"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Խոշորացում"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Խոշորացման հատվածը"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Ցուցադրել տեղաշարժման կառավարը"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Ցուցադրել ջոյսթիքաձև կառավարը՝ խոշորացման հատվածը տեղաշարժելու համար"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Խոշորացման կարգավորումներ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Խոշորացնել դյուրանցման կամ եռակի հպելու օգնությամբ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Խոշորացման գործառույթի մասին"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Ընտրանքներ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Խոշորացույց էկրանի վրա"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Հպել 3 անգամ՝ մեծացնելու համար"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Հպել որևէ կոճակի՝ մեծացնելու համար"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Ընտրեք SIM քարտը"</string>
     <string name="color_orange" msgid="216547825489739010">"Նարնջագույն"</string>
     <string name="color_purple" msgid="6603701972079904843">"Մանուշակագույն"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Վարդագույն"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM քարտը տեղադրված չէ"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM քարտի կարգավիճակը"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM քարտի կարգավիճակ (SIM-ի բնիկ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other">Միացված է <xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Միացրեք «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Բացառություններ"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>՝ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Արգելափակել տեսողական ծանուցումները"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Թույլատրել տեսողական ազդանշանները"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Երբ «Չանհանգստացնել» ռեժիմը միացված է"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Թույլատրել ձայնային ազդանշանները"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ծանուցումների սահմանափակումներ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Անջատել ծանուցումների ձայնը"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Ծանուցումները կցուցադրվեն էկրանին"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Անջատել սարքի ձայնը՝ որոշ բացառություններով"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Բացառություններ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ժամանակացույց"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Դիտել բոլոր բացառությունները"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Բացառություններ, երբ «Չանհանգստացնել» ռեժիմը միացված է"</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_schedule" msgid="2003707171924226212">"Ժամանակացույցներ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Ծանուցումներ, որոնց ձայնն անջատված է"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"«Չանհանգստացնել» ռեժիմում ձայնն ու թրթռոցը անջատվում են: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը:"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Անջատել ձայնը բոլորի համար, բացի հետևյալ կետերից՝"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Անձայն"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Խոսակցություններ"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Թույլատրել հաղորդագրությունները"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Համոզվելու, որ թույլատրված հաղորդագրությունները կազդանշվեն, ստուգեք՝ արդյոք սարքում միացված է զանգը կամ թրթռոցը, թե լռեցված է:"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Երբ գործում է «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» կանոնը, մուտքային հաղորդագրություններն արգելափակվում են: Դուք կարող եք փոխել կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ոչ ոքից"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Արգելափակել զանգերը"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Չթույլատրել"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Թույլատրել զարթուցիչը"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Զարթուցիչ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Ժամաչափերից, զարթուցիչներից, անվտանգության համակարգերից և այլ հավելվածներից"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"զարթուցիչներ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Նվագարկել մեդիայի ձայները"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Մեդիայի ձայներանգներ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Տեսանյութերից, խաղերից և այլ մուլտիմեդիա բովանդակությունից"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"մեդիա"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Թույլատրել հպման ձայները"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Հպման ձայներ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Ստեղնաշարից և այլ կոճակներից"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"հպման ձայներ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Թույլատրել հիշեցումները"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Հիշեցումներ"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Առաջադրանքներից և հիշեցումներից"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"հիշեցումներ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Թույլատրել միջոցառումները"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Միջոցառումներ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Օրացույցի առաջիկա միջոցառումներից"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Թույլատրել հավելվածներին փոխել «Չանհանգստացնել» ռեժիմի կարգավորումները"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Հավելվածների ընդլայնումներ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Ցուցադրում այլ հավելվածների վրայից"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Ցուցադրել մյուս հավելվածների վրայից"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Թույլ տալ այս հավելվածի ցուցադրումը ձեր օգտագործած այլ հավելվածների վրայից: Դա կարող է խանգարել այդ հավելվածների ձեր կողմից օգտագործմանը կամ փոխել դրանք ցուցադրման կամ աշխատանքի եղանակը:"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Հասանելիություն բոլոր ֆայլերին"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Բոլոր ֆայլերը կառավարելու թույլտվություն տալ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Դուք կարող եք թույլատրել այս հավելվածին կարդալ, փոփոխել և ջնջել այս սարքի կամ միացված կրիչների բոլոր ֆայլերը։ Եթե թույլատրեք, հավելվածը կկարողանա օգտվել ֆայլերից՝ առանց ձեր իմացության։"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Հասանելիություն ունեն բոլոր ֆայլերին"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr վիրտուալ իրականություն ունկնդրիչ ստերեո օգնության ծառայություն"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Ցուցադրում այլ հավելվածների վրայից"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>-ից <xliff:g id="COUNT_0">%1$d</xliff:g> հավելվածներ կարող են ցուցադրվել այլ հավելվածների վրա"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 564ce84..02f3ab2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privasi"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Dinonaktifkan oleh admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Tidak tersedia"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status keamanan"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci layar, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci layar, sidik jari"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Saat menggunakan Face Unlock di apl, selalu minta langkah konfirmasi"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Hapus data wajah"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Siapkan Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran.\n\nPerlu diingat:\nPonsel dapat terbuka kuncinya jika Anda melihat ponsel, meski Anda tidak bermaksud untuk membukanya.\n\nPonsel dapat dibuka kuncinya oleh orang lain jika orang itu mendekatkan ponsel ke wajah Anda saat mata Anda terbuka.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya anak atau saudara kembar identik Anda."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran.\n\nPerlu diingat:\nDengan melihat ponsel, Anda dapat membuka kuncinya meski tidak bermaksud untuk membukanya.\n\nOrang lain dapat membuka kunci ponsel Anda jika orang itu mendekatkan ponsel ke wajah Anda.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya saudara kembar identik Anda."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran.\n\nPerlu diingat:\nPonsel dapat terbuka kuncinya jika Anda melihat ponsel, meskipun Anda tidak bermaksud untuk membukanya.\n\nPonsel dapat dibuka kuncinya oleh orang lain jika orang itu mendekatkan ponsel ke wajah Anda meskipun mata Anda tertutup.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya anak atau saudara kembar identik Anda."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Hapus data wajah?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data wajah yang digunakan oleh face unlock akan dihapus dengan aman dan secara permanen. Setelah data dihapus, Anda harus memasukkan PIN, pola, atau sandi untuk membuka kunci ponsel, login ke aplikasi, dan mengonfirmasi pembayaran."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitas"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identitas anonim"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Sandi"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"ID sandi SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Tampilkan sandi"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Pilih AP Band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Otomatis"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Membagikan Wi‑Fi kepada perangkat ini…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Menyambungkan…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Bagikan hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifikasi bahwa ini memang Anda"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifikasi bahwa ini adalah Anda"</string>
     <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">"Sambung-otomatis"</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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Tidak akan nonaktif otomatis"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Akan nonaktif otomatis saat pagi"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tema gelap tidak memancarkan cahaya sama sekali agar daya baterai dapat bertahan lebih lama. Jadwal tema gelap menunggu diaktifkan hingga layar nonaktif."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tema gelap menggunakan latar belakang hitam agar daya baterai dapat bertahan lebih lama di beberapa layar. Jadwal tema gelap menunggu diaktifkan hingga layar nonaktif."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Waktu tunggu layar"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Setel PIN untuk pakai sidik jari"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Untuk keamanan, setel pola"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Masukkan ulang sandi"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Masukkan sandi profil kerja"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Konfirmasi pola Anda"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Masukkan pola profil kerja"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Masukkan ulang PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Masukkan PIN profil kerja"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Sandi tidak cocok"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN tidak cocok"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Gambar pola Anda lagi"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Pembaca layar khusus untuk orang yang mengalami kebutaan atau gangguan penglihatan"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Ketuk item di layar untuk mendengar item tersebut dibacakan"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferensi teks"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Perbesar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area pembesaran"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Tampilkan pengontrol gerakan"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Menampilkan pengontrol seperti joystick untuk memindahkan area pembesaran"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Setelan pembesaran"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Perbesar dengan pintasan &amp; ketuk tiga kali"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Tentang Perbesar"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opsi"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom in di layar"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Ketuk 3 kali untuk memperbesar"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ketuk tombol untuk zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Pilih kartu SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranye"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ungu"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Tidak ada kartu SIM yang dimasukkan"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status SIM (slot sim %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 diaktifkan</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktifkan mode Jangan Ganggu"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Pengecualian"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokir gangguan visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Izinkan sinyal visual"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Saat mode Jangan Ganggu diaktifkan"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Izinkan gangguan yang mengeluarkan suara"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Batasi notifikasi"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Tidak ada suara dari notifikasi"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Anda akan melihat notifikasi pada layar"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Nonaktifkan suara perangkat, namun izinkan pengecualian"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Pengecualian"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Jadwal"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Lihat semua pengecualian"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Pengecualian saat mode Jangan Ganggu diaktifkan"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikasi"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarm &amp; gangguan lainnya"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Jadwal"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notifikasi yang dinonaktifkan"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Jika mode Jangan Ganggu diaktifkan, suara dan getaran akan dimatikan, kecuali untuk item yang Anda izinkan di atas."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Matikan semua kecuali"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Dimatikan"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> lainnya</item>
       <item quantity="one">1 lainnya</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Percakapan"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Izinkan pesan"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Untuk memastikan notifikasi pesan yang diizinkan terdengar, periksa apakah perangkat Anda disetel ke berdering, bergetar, atau senyap."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Tidak ada"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Jangan izinkan panggilan telepon"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Jangan izinkan pesan"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Izinkan alarm"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Dari timer, alarm, sistem keamanan, dan aplikasi lainnya"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarm"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Putar suara media"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Suara media"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Dari video, game, dan media lainnya"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Izinkan suara sentuhan"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Suara sentuhan"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Dari keyboard dan tombol lainnya"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"suara sentuhan"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Izinkan pengingat"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Pengingat"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Dari tugas dan pengingat"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"pengingat"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Izinkan acara"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Acara"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Dari acara kalender mendatang"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Izinkan aplikasi mengganti"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Pengecualian aplikasi"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Tampilkan di dalam apl lain"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Izinkan ditampilkan di atas aplikasi lain"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Izinkan aplikasi ini ditampilkan di atas aplikasi lain yang sedang digunakan. Setelan ini dapat mengganggu penggunaan aplikasi tersebut atau mengubah tampilan atau perilakunya."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Akses semua file"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Izinkan akses untuk mengelola semua file"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Mengizinkan aplikasi ini untuk membaca, mengubah, dan menghapus semua file di perangkat ini atau media penyimpanan yang terpasang. Jika diberikan, aplikasi dapat mengakses file tanpa sepengetahuan Anda."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Dapat mengakses semua file"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr pemroses virtual reality stereo layanan bantuan"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Tampilkan di atas apl lain"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> dari <xliff:g id="COUNT_1">%2$d</xliff:g> aplikasi diizinkan untuk ditampilkan di atas aplikasi lain"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6775f33..b05a610 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Persónuvernd"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Gert óvirkt af kerfisstjóra"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ekki í boði"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Öryggisstaða"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjálás, andlitsopnun"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjálás, fingrafar"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Krefjast alltaf staðfestingarþreps þegar andlitsopnun er notuð"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eyða andlitsgögnum"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Setja upp andlitsopnun"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Notaðu andlitsopnun til að taka tækið úr lás, skrá þig inn í forrit og staðfesta greiðslur.\n\nHafðu í huga að:\nSíminn kann að opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann þinn með því að halda honum upp að andliti þínu þegar þú ert með augun opin.\n\nEinhver sem er mjög lík(ur) þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Notaðu andlitsopnun til að taka tækið úr lás, skrá þig inn í forrit og staðfesta greiðslur.\n\nHafðu í huga að:\nSíminn kann að opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann þinn með því að halda honum upp að andliti þínu.\n\nEinhver sem er mjög lík(ur) þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Notaðu andlitsopnun til að taka tækið úr lás, skrá þig inn í forrit og staðfesta greiðslur.\n\nHafðu í huga að:\nSíminn kann að opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann þinn með því að halda honum upp að andliti þínu, jafnvel þegar þú ert með augun lokuð.\n\nEinhver sem er mjög lík(ur) þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eyða andlitsgögnum?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Andlitsgögnum sem andlitsopnun notar verður eytt varanlega og á öruggan hátt. Þegar þeim hefur verið eytt þarftu PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás, skrá þig inn í forrit og staðfesta greiðslur."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Auðkenni"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Nafnlaust auðkenni"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Aðgangsorð"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-auðkenni aðgangsorðs"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Sýna aðgangsorð"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Velja útvarpstíðni"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Sjálfvirkt"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deilir Wi‑Fi með þessu tæki…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Tengist…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Deila heitum reit"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Staðfestu hver þú ert"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Staðfestu að þetta sért þú"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Slekkur aldrei sjálfkrafa"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Slokknar sjálfkrafa við sólarupprás"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Dökkt þema notar kolsvartan lit til að rafhlaðan endist lengur. Áætlanir fyrir dökkt þema verða ekki virkar fyrr en það slokknar á skjánum."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Dökkt þema notar svartan bakgrunn á sumum skjámyndum til að rafhlaðan endist lengur. Áætlanir fyrir dökkt þema verða ekki virkar fyrr en það slokknar á skjánum."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tímamörk skjás"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN-númer þarf fyrir fingrafar"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Stilltu mynstur til að gæta fyllsta öryggis"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Sláðu aðgangsorðið inn aftur"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Sláðu inn aðgangsorð fyrir vinnu"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Staðfestu mynstrið"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Teiknaðu mynstur fyrir vinnu"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Sláðu PIN-númerið inn aftur"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Sláðu inn PIN-númer fyrir vinnu"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Aðgangsorðin stemma ekki."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-númerin stemma ekki"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Teiknaðu mynstrið aftur"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Skjálesari sem er fyrst og fremst hugsaður fyrir þá sem eru blindir eða sjóndaprir"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Ýttu á atriði á skjánum til að heyra þau lesin upp"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Stækka"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Stækkunarsvæði"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Sýna stýripinna fyrir færslu"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Sýna stýripinna til að færa stækkunarsvæðið"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Stillingar stækkunar"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Stækka með flýtilykli og með því að ýta þrisvar"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Um Stækkun"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Valkostir"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Auka aðdrátt á skjá"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Ýtt þrisvar til að auka aðdrátt"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ýttu á hnapp til að stækka"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Velja SIM-kort"</string>
     <string name="color_orange" msgid="216547825489739010">"Appelsínugulur"</string>
     <string name="color_purple" msgid="6603701972079904843">"Fjólublár"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Bleikur"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Ekkert SIM-kort í"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Staða SIM-korts"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-staða (SIM-rauf %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other">Kveikt á <xliff:g id="ON_COUNT">%d</xliff:g></item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Kveikja á „Ónáðið ekki“"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Undantekningar"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Útiloka sjónrænt áreiti"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Leyfa sjónræn merki"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Þegar kveikt er á „Ónáðið ekki“"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Leyfa truflanir sem gefa frá sér hljóð"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Takmarka tilkynningar"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ekkert hljóð frá tilkynningum"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Þú munt sjá tilkynningar á skjánum þínum"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Þagga í tækinu en leyfa undantekningar"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Undantekningar"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Áætlun"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Sjá allar undantekningar"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Undantekningar þegar kveikt er á „Ónáðið ekki“"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Fólk"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Forrit"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Vekjarar &amp; aðrar truflanir"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Áætlanir"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Þaggaðar tilkynningar"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Þegar kveikt er á „Ónáðið ekki“ gefur síminn hvorki frá sér hljóð né titrar, nema vegna þeirra atriða sem þú leyfir hér fyrir ofan."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Þagga allt nema"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Þaggað"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Samtöl"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Leyfa skilaboð"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Til að tryggja að það heyrist í leyfðum skilaboðum skaltu athuga hvort tækið sé stillt á að hringja, titra eða vera hljóðlaust."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ekkert"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ekki leyfa nein símtöl"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ekki leyfa nein skilaboð"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Leyfa vekjara"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Vekjarar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Frá teljurum, vekjurum, öryggiskerfi og öðrum forritum"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"vekjarar"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Spila hljóð efnis"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Efnishljóð"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Frá myndskeiðum, leikjum og öðru efni"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"margmiðlunarefni"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Leyfa snertihljóð"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Snertihljóð"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Af lyklaborðinu þínu og öðrum hnöppum"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"snertihljóð"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Leyfa áminningar"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Áminningar"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Frá verkefnum og áminningum"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"áminningar"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Leyfa viðburði"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Viðburðir"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Frá viðburðum á döfinni í dagatali"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Leyfa forritum að hnekkja"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Undantekningar forrita"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Opna ofan á öðrum forritum"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Leyfa að opnað sé ofan á öðrum forritum"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Leyfa þessu forriti að opnast ofan á öðrum opnum forritum. Forritið kann að trufla notkun hinna forritanna eða breyta útliti þeirra eða virkni."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Aðgangur að öllum skrám"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Leyfa aðgang til að stjórna öllum skrám"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Leyfa þessu forriti að lesa, breyta og eyða öllum skrám í þessu tæki eða tengdum geymsludrifum. Ef heimild er veitt fær forritið aðgang að skránum þínum án þess að þér sé tilkynnt sérstaklega um það."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Hefur aðgang að öllum skrám"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"sýndarveruleiki vöktun víðóma hjálp þjónusta"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Opna ofan á öðrum forritum"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> forritum mega opnast ofan á öðrum forritum"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a690712..f1db64e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Disattivata dall\'amministratore"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Non disponibile"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Stato sicurezza"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocco schermo, Sblocco con il volto"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocco schermo, impronta"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Chiedi sempre conferma se viene usato Sblocco con il volto nelle app"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Elimina dati volto"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Imposta Sblocco con il volto"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Usa la funzionalità Sblocco con il volto per sbloccare il dispositivo, accedere alle app e confermare pagamenti.\n\nTieni presente che:\nSe guardi il telefono puoi sbloccarlo anche quando non hai intenzione di farlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso e hai gli occhi aperti.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Usa la funzionalità Sblocco con il volto per sbloccare il dispositivo, accedere alle app e confermare pagamenti.\n\nTieni presente che:\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Usa la funzionalità Sblocco con il volto per sbloccare il dispositivo, accedere alle app e confermare pagamenti.\n\nTieni presente che:\nSe guardi il telefono puoi sbloccarlo anche quando non hai intenzione di farlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un fratello gemello."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eliminare i dati del volto?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"I dati del viso usati da Sblocco con il volto verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti servirà il PIN, la sequenza o la password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identità"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identità anonima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificatore password SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostra password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Seleziona banda AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatica"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Condivisione della rete Wi‑Fi con questo dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Connessione…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Condividi hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Dimostra che sei tu"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifica la tua identità"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Non verrà mai disattivato automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Verrà disattivato automaticamente al tramonto"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Il tema scuro usa il nero basato sulla tecnologia True Black per aumentare la durata della batteria. Le pianificazioni del tema scuro si attivano solo se lo schermo è spento."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Il tema scuro usa uno sfondo nero per aumentare la durata della batteria su alcuni schermi. Le pianificazioni del tema scuro si attivano solo se lo schermo è spento."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Spegnimento schermo"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Per usare l\'impronta, imposta un PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Per sicurezza, imposta una sequenza"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Inserisci di nuovo la password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Inserisci password profilo di lavoro"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Conferma la tua sequenza"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ins. sequenza profilo lavoro"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Inserisci di nuovo il PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Inserisci PIN profilo di lavoro"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Le password non corrispondono"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"I PIN non corrispondono"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Traccia di nuovo la sequenza"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Lo screen reader è rivolto principalmente a utenti non vedenti o con problemi di vista"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tocca gli elementi sullo schermo per la lettura ad alta voce"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferenze sottotitoli"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ingrandimento"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Ingrandisci"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area di ingrandimento"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostra controller spostamento"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostra un controller in stile joystick per spostare l\'area di ingrandimento"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Impostazioni ingrandimento"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ingrandisci con scorciatoia e triplo tocco"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Informazioni su Ingrandisci"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opzioni"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Aumenta lo zoom della schermata"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tocca tre volte per eseguire lo zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tocca un pulsante per eseguire lo zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Seleziona scheda SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Arancione"</string>
     <string name="color_purple" msgid="6603701972079904843">"Viola"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nessuna scheda SIM inserita"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Stato SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stato della SIM (slot SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 attiva</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Attiva Non disturbare"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Eccezioni"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blocca interruzioni visive"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Consenti segnali visivi"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quando è attiva la modalità Non disturbare"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Consenti le interruzioni con audio"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Limita notifiche"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notifiche senza audio"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Vedrai le notifiche sullo schermo"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Disattiva l\'audio, ma consenti le eccezioni"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Eccezioni"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Pianificazione"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Visualizza tutte le eccezioni"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Eccezioni quando è attiva la modalità Non disturbare"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Sveglie e altre interruzioni"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programmazioni"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notifiche senza audio"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Quando la modalità Non disturbare è attiva, l\'audio e la vibrazione verranno disattivati, ad eccezione degli elementi che hai consentito sopra."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Disattiva l\'audio per tutti tranne"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Audio disattivato"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Altri <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">1 altro</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Conversazioni"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Consenti messaggi"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Per assicurarti che la suoneria dei messaggi consentiti sia attiva, controlla se sul dispositivo sono impostati lo squillo, la vibrazione o la modalità silenziosa."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nessuno"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Non consentire le chiamate"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Non consentire nessun messaggio"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Consenti sveglie"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Sveglie"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Di timer, sveglie, sistemi di sicurezza e altre app"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"sveglie"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Riproduci suoni multimediali"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Suoni di contenuti multimediali"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Di video, giochi e altri contenuti multimediali"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"contenuti multimediali"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Consenti suoni alla pressione"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Suoni alla pressione"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Della tastiera e di altri pulsanti"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"suoni alla pressione"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Consenti promemoria"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Promemoria"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Di attività e promemoria"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"promemoria"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Consenti eventi"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventi"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Di eventi di calendario imminenti"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Consenti alle app di ignorarla"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Eccezioni per le app"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Mostra sopra altre app"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Consenti la visualizzazione sopra altre app"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Consenti a quest\'app di essere mostrata sopra le altre app in uso. Potrebbe interferire con il tuo utilizzo di queste app o modificare il modo in cui vengono mostrate o si comportano."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Accesso a tutti i file"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Consenti accesso per gestione di tutti i file"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Consenti a questa app di leggere, modificare ed eliminare tutti i file memorizzati su questo dispositivo o su qualsiasi volume di archiviazione collegato. Se concedi l\'autorizzazione, l\'app può accedere ai file a tua insaputa."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Possono accedere a tutti i file"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr realtà virtuale listener stereo helper servizio"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Mostra sopra altre app"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> di <xliff:g id="COUNT_1">%2$d</xliff:g> app visualizzabili sopra le altre app"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a95b461..e17983f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"‏הגדרת \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"הגדרת \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"פרטיות"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"הושבת על ידי מנהל המכשיר"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"לא זמינה"</string>
     <string name="security_status_title" msgid="6958004275337618656">"סטטוס אבטחה"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"נעילת מסך, שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"נעילת מסך, טביעת אצבע"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"כשמשתמשים בשחרור נעילה על ידי זיהוי פנים באפליקציות, יש לדרוש תמיד שלב אימות"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"מחיקת נתוני הפנים"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"הגדרת שחרור נעילה על ידי זיהוי פנים"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"אפשר להשתמש בשחרור נעילה על ידי זיהוי פנים כדי לשחרר את נעילת המכשיר, להיכנס לחשבון באפליקציות ולאשר תשלומים.\n\nחשוב לזכור:\nמבט לטלפון עשוי לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר, אם הטלפון מוחזק אל מול הפנים שלך ועיניך פקוחות.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"אפשר להשתמש בשחרור נעילה על ידי זיהוי פנים כדי לבטל את נעילת המכשיר, להיכנס לאפליקציות ולאשר תשלומים.\n\nחשוב לזכור:\nמבט לטלפון עלול לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עלולה להתבטל על ידי מישהו אחר, אם הטלפון מופנה אל הפנים שלך.\n\nנעילת הטלפון עלולה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"אפשר להשתמש בשחרור נעילה על ידי זיהוי פנים כדי לשחרר את נעילת המכשיר, להיכנס לחשבון באפליקציות ולאשר תשלומים.\n\nחשוב לזכור:\nמבט לטלפון עשוי לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר אם הוא יפנה את הטלפון לפנים שלך, גם אם עיניך עצומות.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"למחוק נתוני פנים?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"נתוני הפנים שמשמשים את התכונה \'שחרור נעילה על ידי זיהוי פנים\' יימחקו לתמיד ובאופן מאובטח. אחרי ההסרה יהיה צורך בקוד האימות, קו ביטול הנעילה או הסיסמה כדי לבטל את נעילת הטלפון, להיכנס לאפליקציות ולאשר תשלומים."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"זהות"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"זהות אנונימית"</string>
     <string name="wifi_password" msgid="1458802324849513755">"סיסמה"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"‏מזהה סיסמה מסוג SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"הצגת סיסמה"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"‏בחר תדר AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"אוטומטי"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"‏מתבצע שיתוף Wi‑Fi עם מכשיר זה…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"בתהליך התחברות…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"שיתוף של נקודה לשיתוף אינטרנט"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"אימות הזהות שלך"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"אימות זהותך"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ללא כיבוי אוטומטי"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"כיבוי אוטומטי בזריחה"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"העיצוב הכהה משתמש בגוון שחור כדי להאריך את חיי הסוללה. הפעלת העיצוב הכהה מתוזמנת להתחיל לאחר שהמסך נכבה."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"העיצוב הכהה משתמש ברקע שחור במסכים מסוימים כדי להאריך את חיי הסוללה. הפעלת העיצוב הכהה מתוזמנת להתחיל לאחר שהמסך נכבה."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"זמן קצוב לכיבוי המסך"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"כיבוי מסך"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"כדי להשתמש בטביעת אצבע, יש להגדיר קוד גישה"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"לשיפור האבטחה, מומלץ להגדיר קו ביטול נעילה"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"יש להזין את הסיסמה שוב"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"הזנת הסיסמה של פרופיל העבודה"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"אשר את הקו לביטול נעילה"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"הזנת קו ביטול הנעילה לעבודה"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"יש להזין שוב את קוד הגישה"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"הזנת קוד הגישה לפרופיל העבודה"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"הסיסמאות לא תואמות"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"קודי הגישה אינם תואמים"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"יש לשרטט שוב את קו ביטול הנעילה"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"קורא מסך המיועד בעיקר לעיוורים או לבעלי ראייה לקויה"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"הקש על פריטים במסך כדי לשמוע הקראה שלהם"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"כתוביות"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"הגדלה"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"הגדלה"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"אזור ההגדלה"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"הצגת בקר להזזה"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"הצגה של בקר דמוי ג\'ויסטיק להזזת אזור ההגדלה"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"הגדרות ההגדלה"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"הגדלה בעזרת קיצור דרך והקשה שלוש פעמים"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"מידע על הגדלה"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"אפשרויות"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"שינוי מרחק התצוגה (זום)"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"הקש שלוש פעמים כדי לשנות את המרחק מהתצוגה"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"הקש על לחצן כדי לשנות את מרחק התצוגה"</string>
@@ -3170,6 +3176,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"‏בחר כרטיס SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"כתום"</string>
     <string name="color_purple" msgid="6603701972079904843">"סגול"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ורוד"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"‏לא הוכנסו כרטיסי SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"‏סטטוס SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"‏סטטוס SIM (חריץ SIM ‏%1$d)"</string>
@@ -3336,6 +3343,7 @@
       <item quantity="one">אחד מופעל</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"הפעלת מצב נא לא להפריע"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"חריגים"</string>
@@ -3362,7 +3370,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"חסימת הפרעות חזותיות"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"הפעלת אותות חזותיים"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"כשמצב \'נא לא להפריע\' פועל"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"התרת הפרעות עם צלילים"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"הגבלת ההתראות"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ללא צליל מהתראות"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"יוצגו התראות על המסך"</string>
@@ -3427,10 +3435,12 @@
       <item quantity="other">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
       <item quantity="one">ניתן להפעיל לוח זמנים אחד באופן אוטומטי</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"השתקת המכשיר עם התרת חריגים"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"חריגים"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"לוח זמנים"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"הצגת כל החריגות"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"חריגות כשמצב \'נא לא להפריע\' פועל"</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_schedule" msgid="2003707171924226212">"לוחות זמנים"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"התראות מושתקות"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"כשמצב \'נא לא להפריע\' פועל, צלילים ורטט מושתקים, חוץ מהפריטים שאפשרת למעלה."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"אני רוצה להשתיק את הכל, חוץ מ-"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"הושתקו"</string>
@@ -3704,6 +3714,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
       <item quantity="one">1 נוסף</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"שיחות"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"אני רוצה לאפשר הודעות"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"כדי לוודא שהודעות מורשות יישמעו, יש לבדוק אם המכשיר שלך מוגדר לצלצול, לרטט או למצב שקט."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"למשך ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, הודעות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
@@ -3717,15 +3728,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ללא"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ללא התרת שיחות כלל"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ללא התרת הודעות כלל"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"אני רוצה לאפשר התראות"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"התראות"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"מטיימרים, התראות, מערכות אבטחה ואפליקציות אחרות"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"התראות"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"השמעת צלילי מדיה"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"צלילי מדיה"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"מסרטונים, משחקים ומדיה אחרת"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"מדיה"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"אני רוצה לאפשר צלילי מגע"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"צלילי מגע"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"מהמקלדת שלך ומלחצנים אחרים"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"צלילי מגע"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"אני רוצה לאפשר תזכורות"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"תזכורות"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ממשימות ותזכורות"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"תזכורות"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"אני רוצה לאפשר אירועים"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"אירועים"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"מאירועים צפויים ביומן"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ניתן לאפשר לאפליקציות לבטל הגדרה זו"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"הוספת חריגים"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4043,6 +4059,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"תצוגה מעל אפליקציות אחרות"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"הצגה מעל אפליקציות אחרות"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"הגדרה זו מתירה לאפליקציה להופיע מעל אפליקציות אחרות שנמצאות בשימוש. הפעולה הזאת עשויה להפריע לשימוש שלך באפליקציות האלה או לשנות את האופן שבו הן מוצגות או מתנהגות."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"גישה לכל הקבצים"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"הרשאת גישה לניהול כל הקבצים"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"לאפליקציה הזו תהיה הרשאה לקרוא, לשנות ולמחוק את כל הקבצים במכשיר זה או בכל נפח אחסון שמחובר אליו. אם ההרשאה תינתן, האפליקציה תורשה לגשת לקבצים מבלי ליידע אותך במפורש."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"יכולת גישה לכל הקבצים"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"‏שירות מסייע של מציאות מדומה VR להאזנה סטריאופונית"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"תצוגה מעל אפליקציות אחרות"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות להופיע מעל אפליקציות אחרות"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fcc4efa..79f64ee 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"プライバシー"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"管理者により無効にされています"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"利用不可"</string>
     <string name="security_status_title" msgid="6958004275337618656">"セキュリティ ステータス"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"画面ロック、顔認証"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"画面ロック、指紋"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"アプリで顔認証を使用する場合、常に確認手順が必要です"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"顔認証データを削除"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"顔認証を設定"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの確認を行えます。\n\n注:\nスマートフォンを見る動作を無意識に行うと、ロックが解除されることがあります。\n\n目を開いているときにスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できます。"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの確認を行えます。\n\n注:\nスマートフォンを見る動作を無意識に行うと、ロックが解除されることがあります。\n\nスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できます。"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの確認を行えます。\n\n注:\nスマートフォンを見る動作を無意識に行うと、ロックが解除されることがあります。\n\n目を閉じているときでもスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できる可能性があります。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"顔認証データを削除しますか?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"顔認証によって使用された顔認証データは安全かつ完全に削除されます。削除後に、スマートフォンのロック解除、アプリへのログイン、お支払いの確認を行うには、PIN、パターン、パスワードのいずれかが必要になります。"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"匿名ID"</string>
     <string name="wifi_password" msgid="1458802324849513755">"パスワード"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE パスワード ID"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"パスワードを表示する"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP帯域幅を選択"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"自動"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi をこのデバイスと共有しています…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"接続しています…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"アクセス ポイントの共有"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"本人確認"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"本人確認"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"自動で OFF にしない"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"日の出に自動的に OFF"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ダークテーマではトゥルー ブラックを使用するため、電池が長持ちします。画面が OFF になるまでダークテーマが ON にならないように設定できます。"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ダークテーマでは黒い背景を使用するため、一部の画面で電池が長持ちします。画面が OFF になるまでダークテーマが ON にならないように設定できます。"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"画面消灯"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"指紋認証には PIN が必要です"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"セキュリティ強化のため、パターンを設定してください"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"パスワードの再入力"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"仕事用のパスワードを入力"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"パターンの確認"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"仕事用のパターンを入力"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN の再入力"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"仕事用の PIN を入力"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"パスワードが一致しません"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINが一致しません"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"パターンを再入力"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"主に視覚障害者を対象としたスクリーンリーダー ツールです"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"画面上の項目をタップすると、読み上げます"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕の設定"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"拡大"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"画面の拡大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"拡大領域"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"移動コントローラの表示"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"拡大領域を移動する場合にジョイスティックのようなコントローラを表示します"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"拡大の設定"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ショートカットとトリプルタップで拡大"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"画面拡大について"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"オプション"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"画面を拡大します"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ズームするには 3 回タップします"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ボタンをタップしてズームします"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIMカードの選択"</string>
     <string name="color_orange" msgid="216547825489739010">"オレンジ"</string>
     <string name="color_purple" msgid="6603701972079904843">"パープル"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ピンク"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIMカードが挿入されていません"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIMのステータス"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM ステータス(SIM スロット %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 件有効</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"サイレント モードを ON にする"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"例外"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"視覚的な通知のブロック"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"視覚的な割り込みを許可"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"サイレント モードが ON のとき"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"音が出る割り込みの許可"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"通知の制限"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"通知音なし"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"画面に通知が表示されます"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 件のスケジュールを自動的に ON にできます</item>
       <item quantity="one">1 件のスケジュールを自動的に ON にできます</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"デバイスをミュート(例外は許可)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"例外"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"スケジュール"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"すべての例外を表示"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"サイレント モードがオンの場合の例外"</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_schedule" msgid="2003707171924226212">"スケジュール"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"サイレントに設定した通知"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"サイレント モードが ON の場合、上で許可した項目以外の音とバイブレーションはミュートされます。"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"指定した項目を除きすべてミュート"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ミュート中"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">他 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
       <item quantity="one">他 1 人</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"会話"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"メッセージを許可"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"許可したメッセージで必ず音が鳴るようにするには、デバイスの設定が着信音、バイブレーション、ミュートのいずれであるかをご確認ください。"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」の間、受信メッセージはブロックされます。設定を調整することで、友だち、家族などの連絡先からの受信メッセージのブロックを解除できます。"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"なし"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"通話を許可しない"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"メッセージを許可しない"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"アラームを許可"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"アラーム"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"タイマー、アラーム、セキュリティ システム、その他のアプリに関するもの"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"アラーム"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"メディア サウンドを再生"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"メディア サウンド"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"動画、ゲーム、その他のメディアに関するもの"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"メディア"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"タッチ操作音を許可"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"タッチ操作音"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"キーボードとその他のボタンに関するもの"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"タッチ操作音"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"リマインダーを許可"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"リマインダー"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"タスクとリマインダーに関するもの"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"リマインダー"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"予定を許可"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"予定"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"近日中の予定に関するもの"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"アプリのオーバーライドを許可"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"アプリの除外"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"他のアプリの上に重ねて表示"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"他のアプリの上に重ねて表示できるようにする"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"使用中の他のアプリの上にこのアプリを重ねて表示できるようになります。他のアプリを使用する際に邪魔になったり、他のアプリの表示や動作が変わったりする場合があります。"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"すべてのファイルのアクセス"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"すべてのファイルを管理できるアクセス権を付与"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"このアプリに対し、このデバイスまたは接続されているストレージ ボリューム内のすべてのファイルの読み取り、変更、削除を許可します。許可されている場合、アプリがユーザーの事前の承認なしにファイルにアクセスすることもあります。"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"すべてのファイルにアクセス可能"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr バーチャル リアリティ リスナー ステレオ ヘルパー サービス"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"他のアプリの上に重ねて表示"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"他のアプリの上に重ねて表示できるアプリの数: <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> 個"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 0a44484..6d24bef 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"კონფიდენციალურობა"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"გათიშულია ადმინისტრატორის მიერ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"მიუწვდომელი"</string>
     <string name="security_status_title" msgid="6958004275337618656">"უსაფრთხოების სტატუსი"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ეკრანის დაბლოკვა, განბლოკვა სახით"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ეკრანის დაბლოკვა, თითის ანაბეჭდი"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"აპებში სახით განბლოკვის გამოყენებისას, ყოველთვის მოითხოვეთ დადასტურება"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"სახის მონაცემ. წაშლა"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"სახით განბლოკვის დაყენება"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"გამოიყენეთ განბლოკვა სახით მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად.\n\nგაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს, როცა თვალები გახელილი გექნებათ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"გამოიყენეთ სახით განბლოკვა მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად.\n\nგაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"გამოიყენეთ სახით განბლოკვა მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად.\n\nგაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს, თუნდაც თვალები დახუჭული გქონდეთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"წაიშალოს სახის მონაცემები?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"სახით განბლოკვის მიერ გამოყენებული სახის მონაცემები სამუდამოდ და უსაფრთხოდ წაიშლება. ამოშლის შემდეგ, ტელეფონის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად თქვენი PIN-კოდი, ნიმუში ან პაროლი დაგჭირდებათ."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"იდენტობა"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"უცნობი"</string>
     <string name="wifi_password" msgid="1458802324849513755">"პაროლი"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE პაროლის იდენტიფიკატორი"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"პაროლის გამოჩენა"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"აირჩიეთ AP Band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ავტომატური"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ზიარდება Wi‑Fi ამ მოწყობილობასთან…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"მიმდინარეობს დაკავშირება…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"უსადენო ქსელის გაზიარება"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"დაადასტურეთ, რომ თქვენ ხართ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"დაადასტურეთ, რომ თქვენ ხართ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"არასოდეს გამოირთვება ავტომატურად"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ავტომატურად გამოირთვება მზის ამოსვლისას"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"მუქი თემა იყენებს ნამდვილ შავს იმისთვის, რომ თქვენმა ელემენტმა დიდხანს გაძლოს. მუქი თემა აყენებს ჩართვის განრიგს სანამ თქვენი ეკრანი გამორთულია."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"მუქი თემა ზოგიერთ ეკრანზე იყენებს შავ ფონს იმისთვის, რომ ბატარეამ უფრო დიდხანს გაძლოს. მუქი თემა განრიგში აყენებს მოლოდინის ჩართვას სანამ თქვენი ეკრანი გამორთული იქნება."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ეკრანის დროის ლიმიტი"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"ეკრანი გამოირთვება"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> უმოქმედობის შემდეგ"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ანაბეჭდისათვის დააყენეთ PIN-კოდი"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"უსაფრთხოებისთვის დააყენეთ განმბლოკავი ნიმუში"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ხელახლა შეიყვანეთ თქვენი პაროლი"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"შეიყვანეთ თქვენი სამსახურის პაროლი"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"დაადასტურეთ ნიმუში"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"შეიყვანეთ სამსახურის ნიმუში"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ხელახლა შეიყვანეთ თქვენი PIN-კოდი"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"შეიყვანეთ თქვენი სამსახურის PIN-კოდი"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"პაროლები არ ემთხვევა"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-კოდები არ ემთხვევა"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ისევ მოხაზეთ თქვენი განმბლოკავი ნიმუში"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ეკრანის წამკითხველი შექმნილია მხედველობის პრობლემების მქონე ადამიანებისთვის"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ერთეულების მოსასმენად, შეეხეთ მათ თქვენს ეკრანზე"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"სუბტიტრების პარამეტრები"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"გადიდება"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"გადიდება"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"გადიდების უბანი"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"მოძრაობის კონტროლერის ჩვენება"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ჯოისტიკის მსგავსი კონტროლერის ჩვენება გადიდების უბნის გადასატანად"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"გადიდების პარამეტრები"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"გადიდება მალსახმობითა და სამმაგი შეხებით"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"გადიდების შესახებ"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ვარიანტები"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ეკრანზე მასშტაბის გადიდება"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"მასშტაბის გასაზრდელად, შეეხეთ 3-ჯერ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"მასშტაბირება ღილაკზე შეხებით"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"აირჩიეთ SIM ბარათი"</string>
     <string name="color_orange" msgid="216547825489739010">"ნარინჯისფერი"</string>
     <string name="color_purple" msgid="6603701972079904843">"მეწამული"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ვარდისფერი"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM ბარათები მოთავსებული არ არის"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM სტატუსი"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-ის სტატუსი (SIM სათავსო %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">ჩართულია 1</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"„არ შემაწუხოთ“ რეჟიმის ჩართვა"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"გამონაკლისები"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ვიზუალური სიგნალების დაბლოკვა"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ვიზუალური სიგნალების დაშვება"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"როცა ჩართულია „არ შემაწუხოთ“ რეჟიმი"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ხმის გამომცემი წყვეტების დაშვება"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"შეტყობინებების შეზღუდვა"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"შეტყობინებები ხმის გარეშე"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"შეტყობინებები გამოჩნდება ეკრანზე"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
       <item quantity="one">1 განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"დადუმდეს მოწყობილობა, თუმცა დაიშვას გამონაკლისები"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"გამონაკლისები"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"განრიგი"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ყველა გამონაკლისის ნახვა"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"გამონაკლისები, როცა ჩართულია „არ შემაწუხოთ“ რეჟიმი"</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_schedule" msgid="2003707171924226212">"განრიგები"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"დადუმებული შეტყობინებები"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა ხმოვანი და ვიბროსიგნალი იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"დადუმდეს ყველაფერი შემდეგის გარდა"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"დადუმებული"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> სხვა</item>
       <item quantity="one">1 სხვა</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"მიმოწერები"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"შეტყობინებების დაშვება"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"იმაში დასარწმუნებლად, რომ დაშვებული შეტყობინებები გამოსცემს ხმას, შეამოწმეთ, რა არის დაყენებული თქვენი მოწყობილობისთვის — ზარი, ვიბრაცია თუ ჩუმი რეჟიმი."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"„<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“-ის ფარგლებში შემომავალი შეტყობინებები დაბლოკილია. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"არავისგან"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ყველა ზარის აკრძალვა"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ყველა შეტყობინების აკრძალვა"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"მაღვიძარების დაშვება"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"მაღვიძარები"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ტაიმერებიდან, მაღვიძარებიდან, უსაფრთხოების სისტემებიდან და სხვა აპებიდან"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"გაფრთხილებები"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"მედიის ხმის დაკვრა"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"მედიის ხმები"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ვიდეოებიდან, თამაშებიდან და სხვა მედიებიდან"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"მედია"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"შეხების ხმების დაშვება"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"შეხების ხმები"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"თქვენი კლავიატურიდან და სხვა ღილაკებიდან"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"შეხების ხმები"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"შეხსენებების დაშვება"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"შეხსენებები"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ამოცანებიდან და შეხსენებებიდან"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"შეხსენებები"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"მოვლენების დაშვება"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ღონისძიებები"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"კალენდრის მოახლოებული ღონისძიებებიდან"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"აპებისთვის უგულებელყოფის დაშვება"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"აპების გამონაკლისები"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"სხვა აპების ზემოდან გამოჩენა"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"სხვა აპების ზემოდან გამოჩენის დაშვება"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ეს საშუალებას მისცემს აპს, გამოჩნდეს სხვა აპების ზემოდან. ამან შეიძლება გავლენა იქონიოს სხვა აპებით სარგებლობის პროცესზე, ან შეცვალოს მათი იერსახე თუ ქცევა."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"წვდომა ყველა ფაილზე"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"წვდომის დაშვება ყველა ფაილის სამართავად"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"აპს აძლევს უფლებას, წაიკითხოს, შეცვალოს და წაშალოს ყველა ფაილი ამ მოწყობილობაზე და ნებისმიერ დაკავშირებულ მეხსიერებაზე. ამ უფლების მინიჭების შემთხვევაში, აპს შეიძლება ფაილებზე წვდომა ჰქონდეს ისე, რომ ამის შესახებ არ იცოდეთ."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"შეუძლია ჰქონდეს წვდომა ყველა ფაილზე"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr ვირტუალური რეალობა მსმენელი სტერეო დამხმარე სერვისი"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"სხვა აპების ზემოდან გამოჩენა"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"სხვა აპების ზემოდან გამოჩენა <xliff:g id="COUNT_1">%2$d</xliff:g>-დან <xliff:g id="COUNT_0">%1$d</xliff:g> აპს შეუძლია"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 7f9a011..9582fd7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Менің аймағым, экран бекіту, SIM картасын құлыптау, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Құпиялылық"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Әкімші өшірген"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Қолжетімді емес"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Қауіпсіздік күйі"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды құлыптау, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды құлыптау, саусақ ізі"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Қолданбаларда Face Unlock функциясын пайдаланған кезде, растау қадамын сұрау"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Адам жүзі деректерін жою"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Face Unlock функциясын реттеу"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады (көзіңізді ашып тұруыңыз керек).\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады.\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Адам жүзі туралы деректер жойылсын ба?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlock функциясы пайдаланған адам жүзі туралы деректер біржола және қауіпсіз жойылады. Жойылғаннан кейін, телефоныңыздың құлпын ашу, қолданбаларға кіру және төлемдерді растау үшін PIN коды, өрнек немесе құпия сөз қажет болады."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Бірлік"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Анонимді бірлік"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Құпия сөз"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE құпия сөз идентификаторы"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Құпия сөзді көрсету"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Wi-Fi жиілік ауқымын таңдау"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Авто"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Осы құрылғымен Wi‑Fi байланысы бөлісілуде…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Жалғануда…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Хотспотты бөлісу"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Бұл сіз екеніңізді растаңыз"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Бұл өзіңіз екенін растаңыз"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Автоматты өшпейді"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Күн шыққанда, автоматты өшеді"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Батареяның заряды ұзаққа жетуі үшін, қараңғы тақырып қара түсті қолданады. Экран өшпейінше, қараңғы тақырып кестелері қосылмайды."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Қараңғы батарея кейбір экрандарда батарея зарядын ұзаққа жеткізу үшін қара фонды пайдаланады. Экран өшпейінше, қараңғы тақырып кестелері қосылмайды."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Экранның күту уақыты"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Саусақ ізін пайдалану үшін PIN кодын орнатыңыз"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Қауіпсіздік үшін өрнек орнатыңыз"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Құпия сөзді қайта енгізіңіз"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Жұмыс құпия сөзін енгізіңіз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Өрнекті растаңыз"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Жұмыс өрнегін енгізіңіз"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN кодын қайта енгізіңіз"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Жұмыс PIN кодын енгізіңіз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Құпия сөздер сәйкес емес"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN кодтары сәйкес емес"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Өрнекті қайта салыңыз"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Экранды оқу құралы негізінен көру қабілеті нашар адамдарға арналған"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Дауыстап оқылуы үшін экрандағы элементтерді түртіңіз"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Субтитр параметрлері"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ұлғайту"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Ұлғайту"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Ұлғайту аймағы"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Жылжыту құралын көрсету"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Ұлғайту аймағын жылжытуға арналған джойстикке ұқсас басқару құралы көрсетіледі."</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Ұлғайту параметрлері"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Таңбашамен және үш рет түртіп үлкейту"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Ұлғайту туралы ақпарат"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Oпциялар"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Экранда ұлғайту"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Масштабтау үшін 3 рет түртіңіз"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Масштабтау үшін түймені түртіңіз"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM картасын таңдау"</string>
     <string name="color_orange" msgid="216547825489739010">"Сарғылт"</string>
     <string name="color_purple" msgid="6603701972079904843">"Қызылкүрең"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Қызғылт"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM карталары салынбаған"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM күйі"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM картасының күйі (sim ұясы: %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 іске қосылды</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Мазаламау\" режимін қосу"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Ерекше жағдайлар"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Көрнекі мазалағыштарды бөгеу"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуалды сигналдарды қосу"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"\"Мазаламау\" режимі қосулы кезде"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Дыбыстық хабарландыруларға рұқсат ету"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Хабарландыруларды шектеу"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Хабарландырулар дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Хабарландырулар экранға шығады"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> кестені автоматты түрде қосуға болады</item>
       <item quantity="one">1 кестені автоматты түрде қосуға болады</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Құрылғының дыбысын өшіру (ерекше жағдайларды қоспағанда)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Ерекше жағдайлар"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Кесте"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Барлық ерекше жағдайларды көру"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"\"Мазаламау\" режимі қосулы кездегі ерекше жағдай"</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_schedule" msgid="2003707171924226212">"Кестелер"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Дыбысы өшірілген хабарландырулар"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"\"Мазаламау\" режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Келесілерді қоспағанда, барлығының дыбысын өшіру:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Дыбысы өшірулі"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Тағы <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакт</item>
       <item quantity="one">Тағы 1 контакт</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Сөйлесулер"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Хабарларға рұқсат ету"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Сізге хабар келгенде, дыбыс шығуы үшін, құрылғының шылдыр, діріл немесе дыбыссыз режимде тұрғанын тексеріңіз."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін кіріс хабарларға тыйым салынған. Достарыңыз, отбасыңыздың мүшелері не басқа контактілеріңіз сізге хабарласа алуы үшін, параметрлерді реттеуіңізге болады."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ешқандай"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Қоңырауға рұқсат етпеу"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ешқандай хабарға рұқсат етпеу"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Дабылдарға рұқсат ету"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Дабылдар"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Таймерлерден, дабылдардан, қауіпсіздік жүйелерінен және басқа қолданбалардан"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"дабылдар"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Мультимедиалық дыбыстарды ойнату"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Mультимeдиа дыбыстары"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Бейнелерден, ойындардан және басқа медиа файлдардан"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"мультимeдиа"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Түрту дыбыстарына рұқсат ету"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Түрту дыбысы"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Пернетақтадан және басқа түймелерден"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"түрту дыбысы"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Еске салғыштарға рұқсат ету"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Еске салғыштар"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Тапсырмалардан және еске салғыштардан"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"еске салғыштар"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Іс-шараларға рұқсат ету"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Іс-шаралар"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Алдағы күнтізбе іс-шараларынан"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Қолданбаларға қайта анықтауға рұқсат беру"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Қолданба ерекшеліктері"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3705,7 +3721,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Сұрамастан ашу"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Қолдау көрсетілетін сілтемелер"</string>
     <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Басқа әдепкі мәндер"</string>
-    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ішінде <xliff:g id="SIZE">%1$s</xliff:g> пайдаланылған"</string>
+    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> пайдаланылған"</string>
     <string name="storage_type_internal" msgid="8072987826282477558">"Ішкі жад"</string>
     <string name="storage_type_external" msgid="8258689891893683905">"Сыртқы жад"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="DATE">%2$s</xliff:g> бері <xliff:g id="SIZE">%1$s</xliff:g>"</string>
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Басқа қолданбалардың үстінен көрсету"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Басқа қолданба үстінен көрсетуге рұқсат беру"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріледі. Ол қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмысын өзгертуі мүмкін."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Барлық файлды пайдалану"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Барлық файлды пайдалануға рұқсат беру"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Қолданбаға осы құрылғыдағы немесе жалғанған сыртқы жад құрылғыларындағы барлық файлды оқуға, өзгертуге немесе жоюға рұқсат береді. Егер осы рұқсат берілсе, қолданба файлдарды сіздің келісіміңізсіз пайдалана алады."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Барлық файлды пайдалана алатын қолданбалар"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"виртуалды шындық тыңдаушысының стерео көмекші қызметі"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Басқа қолданбалардың үстінен көрсету"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> қолданбаның <xliff:g id="COUNT_0">%1$d</xliff:g>-на(не) басқа қолданбалардың үстінен шығуға рұқсат берілген"</string>
@@ -4365,7 +4385,7 @@
     <string name="storage_size_large_alternate" msgid="7555149858858591495">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="7102720999351050601">"Жалпы <xliff:g id="TOTAL">%1$s</xliff:g> жадтан пайдаланылған"</string>
     <string name="storage_percent_full" msgid="7211888326013020857">"пайдаланылған"</string>
-    <string name="clear_instant_app_data" msgid="5951258323364386357">"Қолданбаны деректерін өшіру"</string>
+    <string name="clear_instant_app_data" msgid="5951258323364386357">"Қолданбаны өшіру"</string>
     <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Бұл лездік қолданбаны өшіргіңіз келе ме?"</string>
     <string name="launch_instant_app" msgid="8503927414339606561">"Ашу"</string>
     <string name="game_storage_settings" msgid="2521393115726178837">"Ойындар"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 867f77e..4706e5f 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ឯកជនភាព"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"មិនមានទេ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ស្ថានភាព​សុវត្ថិភាព"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ការចាក់សោអេក្រង់ ការដោះសោតាមទម្រង់មុខ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ការចាក់សោអេក្រង់ ស្នាមម្រាមដៃ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"តម្រូវឱ្យបញ្ជាក់ជានិច្ច នៅពេលប្រើការដោះសោតាមទម្រង់មុខនៅក្នុងកម្មវិធី"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"លុប​ទិន្នន័យ​ទម្រង់មុខ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"រៀបចំ​ការដោះសោ​តាម​ទម្រង់​មុខ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ប្រើ​ការដោះសោ​តាមទម្រង់មុខ ដើម្បី​ដោះសោ​ឧបករណ៍​របស់អ្នក ចូល​កម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់។\n\nសូមចងចាំ​ថា៖\nការមើល​​ទូរសព្ទ​អាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជា​អ្នក​មិនចង់​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក​ ប្រសិនបើ​ទូរសព្ទនេះ​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក នៅពេលដែល​អ្នកបើក​ភ្នែក។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាចនឹង​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ប្រើ​ការដោះសោ​តាមទម្រង់មុខ ដើម្បី​ដោះសោ​ឧបករណ៍​របស់អ្នក ចូល​កម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់។\n\nសូមចងចាំ​ថា៖\nការមើល​ទូរសព្ទ​អាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជា​អ្នក​មិនមាន​បំណង​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក​ ប្រសិនបើ​ទូរសព្ទនេះ​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាចនឹង​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ប្រើ​ការដោះសោ​តាមទម្រង់មុខ ដើម្បី​ដោះសោ​ឧបករណ៍​របស់អ្នក ចូល​កម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់។\n\nសូមចងចាំ​ថា៖\nការមើលទៅ​​ទូរសព្ទ​អាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជា​អ្នក​មិនចង់​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក​ ប្រសិនបើ​វា​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក ទោះបីជាអ្នកបិទ​ភ្នែកក៏ដោយ។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"លុប​ទិន្នន័យ​ទម្រង់​មុខ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ទិន្នន័យ​ទម្រង់មុខ​ដែលប្រើដោយ​មុខងារ​ដោះសោ​តាមទម្រង់មុខ​នឹងត្រូវបាន​លុបជាអចិន្ត្រៃយ៍ និង​ប្រកបដោយ​សុវត្ថិភាព។ បន្ទាប់ពី​លុបហើយ អ្នក​នឹងត្រូវប្រើកូដ PIN, លំនាំ ឬ​ពាក្យសម្ងាត់ ដើម្បី​ដោះសោ​ទូរសព្ទ​របស់អ្នក ចូលកម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់​ជាដើម។"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"អត្តសញ្ញាណ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"អត្តសញ្ញាណ​អនាមិក"</string>
     <string name="wifi_password" msgid="1458802324849513755">"ពាក្យសម្ងាត់​"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"ព័ត៌មានសម្គាល់ពាក្យសម្ងាត់ SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"ជ្រើសរើសរលកសញ្ញា AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ស្វ័យប្រវត្តិ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"កំពុង​ចែករំលែក Wi‑Fi ជាមួយ​ឧបករណ៍​នេះ…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"កំពុង​ភ្ជាប់…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ចែករំលែក​ហតស្ប៉ត"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ផ្ទៀងផ្ទាត់ថាជាអ្នក"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ផ្ទៀងផ្ទាត់​ថាគឺ​ជាអ្នក"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"នឹងបិទដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃរះ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"រចនាប័ទ្ម​ងងឹត​ប្រើពណ៌​ខ្មៅសុទ្ធ ដើម្បីជួយ​រក្សាថាមពលថ្ម​របស់អ្នក​ឱ្យនៅ​បានយូរ​ជាងមុន។ កាលវិភាគ​រចនាប័ទ្មងងឹត​រង់ចាំបើក រហូតទាល់តែ​អេក្រង់​របស់អ្នក​ត្រូវបានបិទ។"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"រចនាប័ទ្មងងឹត​ប្រើផ្ទៃខាងក្រោយ​ពណ៌ខ្មៅ ដើម្បីជួយ​រក្សាថាមពលថ្ម​ឱ្យនៅបានយូរ​ជាងមុន​នៅលើអេក្រង់​មួយចំនួន។ កាលវិភាគ​រចនាប័ទ្មងងឹត​រង់ចាំបើក រហូតទាល់តែ​អេក្រង់​របស់អ្នក​ត្រូវបានបិទ។"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"អស់ម៉ោងអេក្រង់"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"អេក្រង់​បិទ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​កូដ PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​លំនាំ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក​ម្តងទៀត"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"បញ្ចូល​ពាក្យសម្ងាត់​ការងារ​របស់អ្នក"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"បញ្ជាក់​លំនាំដើម​របស់​អ្នក"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"បញ្ចូល​លំនាំការងារ​របស់អ្នក"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"បញ្ចូល​កូដ PIN របស់អ្នក​ម្តងទៀត"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"បញ្ចូល​កូដ PIN ការងារ​របស់អ្នក"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"ពាក្យសម្ងាត់​មិន​ដូចគ្នា"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"កូដ PINs មិន​ដូច​គ្នា"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"គូរ​លំនាំ​របស់អ្នក​ម្ដង​ទៀត"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"កម្មវិធីអានអេក្រង់បង្កើតឡើងជាចម្បងសម្រាប់មនុស្សពិការភ្នែក និងអ្នកខ្សោយភ្នែក"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ចុចធាតុ​នៅលើ​អេក្រង់​របស់អ្នក​ដើម្បី​ស្ដាប់​ធាតុ​ទាំង​នោះ​បញ្ចេញសំឡេង​ឮៗ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ចំណូលចិត្ត​អក្សររត់"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ការពង្រីក"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ពង្រីក"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ផ្ទៃ​ពង្រីក"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"បង្ហាញឧបករណ៍បញ្ជាឱ្យផ្លាស់ទី"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"បង្ហាញ​ឧបករណ៍បញ្ជា​មានរាងដូច​ដងបញ្ជា​ដែលប្រើ​សម្រាប់​ផ្លាស់ទី​ផ្ទៃ​ពង្រីក"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ការកំណត់​ការពង្រីក"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ពង្រីកដោយប្រើផ្លូវកាត់ និងចុចបីដង"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"អំពី​ \"ពង្រីក\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ជម្រើស"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ពង្រីកនៅលើអេក្រង់"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ប៉ះ 3 ដងដើម្បីពង្រីក"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ចុចប៊ូតុងដើម្បីពង្រីក ឬបង្រួម"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ជ្រើស​ស៊ី​ម​កាត"</string>
     <string name="color_orange" msgid="216547825489739010">"ទឹកក្រូច"</string>
     <string name="color_purple" msgid="6603701972079904843">"ស្វាយ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ផ្កាឈូក"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"គ្មាន​ស៊ី​ម​កាត​បាន​បញ្ចូល"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ស្ថានភាព​ស៊ី​ម​កាត"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ស្ថានភាពស៊ីម (រន្ធស៊ីម %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">បាន​បើកកាលវិភាគ​ 1</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"បើកមុខងារកុំរំខាន"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ការលើក​លែង"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>៖ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"រារាំងការរំខានក្នុងការមើល"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"អនុញ្ញាត​សញ្ញា​ដែលមើល​ឃើញ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"នៅ​ពេល​បើក​មុខងារ​កុំ​រំខាន"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"អនុញ្ញាត​ការរំខានដែលបញ្ចេញសំឡេង"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ដាក់​កំហិត​ការ​ជូនដំណឹង"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"គ្មានសំឡេង​ពីការជូន​ដំណឹងទេ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"អ្នក​នឹង​ឃើញ​ការ​ជូនដំណឹង​នៅលើអេក្រង់​របស់អ្នក"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other">កាលវិភាគ <xliff:g id="ON_COUNT">%d</xliff:g> អាច​បើកដោយស្វ័យប្រវត្តិ</item>
       <item quantity="one">កាលវិភាគ 1 អាច​បើកដោយស្វ័យប្រវត្តិ</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"បិ​ទ​សំឡេង​ឧបករណ៍ ប៉ុន្តែ​អនុញ្ញាត​ការលើកលែង"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ការលើក​លែង"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"កាលវិភាគ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"មើល​ការលើកលែង​ទាំងអស់"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"ការលើកលែងនៅ​ពេលបើក​មុខងារកុំ​រំខាន"</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_schedule" msgid="2003707171924226212">"កាលវិភាគ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ការជូនដំណឹង​ដែលបិទសំឡេង"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"នៅ​ពេល​មុខងារ​កុំ​រំខាន​បើក សំឡេង និង​ការញ័រ​នឹង​ត្រូវ​បាន​បិទសំឡេង ​លើក​លែង​តែ​អ្វីដែល​អ្នក​អនុញ្ញាត​ខាងលើ​ប៉ុណ្ណោះ។"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"បិទសំឡេង​ទាំងអស់​លើកលែងតែ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"បានបិទសំឡេង"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> នាក់ទៀត</item>
       <item quantity="one">1 នាក់ទៀត</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"ការសន្ទនា"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"អនុញ្ញាត​សារ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ដើម្បី​ប្រាកដថា សារ​ដែលមាន​ការអនុញ្ញាត​អាចបញ្ចេញ​សំឡេង​បាន​ សូម​ពិនិត្យមើល​ថាតើ​ឧបករណ៍​របស់អ្នក​ត្រូវបាន​កំណត់​ឱ្យរោទ៍ ញ័រ ឬ​បិទសំឡេង។"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"បានទប់ស្កាត់​សារចូល​សម្រាប់ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’។ អ្នកអាចកែតម្រូវការកំណត់ ដើម្បីអនុញ្ញាតឱ្យមិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនងផ្សេងទៀតរបស់អ្នកអាចទាក់ទងអ្នកបាន។"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"គ្មាន"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"កុំអនុញ្ញាត​ការហៅទូរសព្ទ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"កុំអនុញ្ញាត​សារ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"អនុញ្ញាត​ម៉ោង​រោទ៍"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ម៉ោងរោទ៍"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ពី​កម្មវិធីកំណត់ម៉ោង ម៉ោងរោទ៍ ប្រព័ន្ធ​សុវត្ថិភាព និងកម្មវិធី​ផ្សេងទៀត"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"សំឡេងរោទិ៍"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"ចាក់​សំឡេង​មេឌៀ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"សំឡេង​មេឌៀ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ពីវីដេអូ ហ្គេម និងមេឌៀ​ផ្សេងទៀត"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"មេឌៀ​"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"អនុញ្ញាត​សំឡេង​ចុច"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"សំឡេង​ចុច"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ពីក្ដារចុច​របស់អ្នក និងប៊ូតុង​ផ្សេងទៀត"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"សំឡេង​ចុច​"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"អនុញ្ញាត​ការរំលឹក"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"កម្មវិធីរំលឹក"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ពី​កិច្ចការ និងការរំលឹក"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ការរំលឹក"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"អនុញ្ញាត​ព្រឹត្តិការណ៍"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ព្រឹត្តិការណ៍"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ពីព្រឹត្តិការណ៍​លើប្រតិទិន​ក្នុងពេលខាងមុខ"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"អនុញ្ញាតឱ្យកម្មវិធី​លុបពីលើ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ការ​លើក​លែង​កម្មវិធី"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"បង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"អនុញ្ញាតឲ្យបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"អនុញ្ញាតឲ្យកម្មវិធីនេះបង្ហាញខ្លួនពីលើកម្មវិធីផ្សេងទៀតដែលអ្នកកំពុងប្រើប្រាស់។ វាអាចនឹងមានការរំខានដល់ការប្រើប្រាស់កម្មវិធីទាំងនោះ ឬផ្លាស់ប្តូររបៀបដែលពួកវាត្រូវបង្ហាញ ឬដំណើរការ។"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ចូលប្រើ​ឯកសារ​ទាំងអស់"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"អនុញ្ញាតឱ្យចូលប្រើ ដើម្បីគ្រប់គ្រងឯកសារទាំងអស់"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"អនុញ្ញាតឱ្យ​កម្មវិធី​នេះ​អាន ពង្រីក និងលុប​ឯកសារ​ទាំងអស់​នៅលើ​ឧបករណ៍​នេះ ឬឧបករណ៍ផ្ទុកទាំងឡាយ​ដែលបានភ្ជាប់។ ប្រសិនបើ​ផ្ដល់​ការអនុញ្ញាត កម្មវិធីនេះ​អាច​ចូលប្រើ​ឯកសារ ដោយ​មិនឱ្យ​អ្នកដឹង។"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"អាច​ចូលប្រើ​ឯកសារ​ទាំងអស់​បាន"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"សេវាកម្មជំនួយសំឡេងស្តេរ៉េអូកម្មវិធីស្តាប់ក្នុងភាពពិតជាក់ស្ដែង vr"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"បង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"កម្មវិធី <xliff:g id="COUNT_0">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="COUNT_1">%2$d</xliff:g> ត្រូវបានអនុញ្ញាតឲ្យបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b7c2391..6a15ea1 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ನನ್ನ ಸ್ಥಳ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ನನ್ನ ಸ್ಥಳ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ಗೌಪ್ಯತೆ"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ಭದ್ರತೆ ಸ್ಥಿತಿ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ಆ್ಯಪ್‌ಗಳಿಗೆ ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸುವಾಗ, ಯಾವಾಗಲೂ ಖಚಿತಪಡಿಸುವ ಅಗತ್ಯವಿದೆ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ಮುಖದ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ.\n\nನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nನಿಮ್ಮ ಕಣ್ಣುಗಳು ತೆರೆದಿರುವಾಗ, ಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಬೇರೆ ಯಾರೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ.\n\nನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಯಾರು ಬೇಕದಾರೂ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ.\n\nನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nನಿಮ್ಮ ಕಣ್ಣುಗಳು ಮುಚ್ಚಿರುವಾಗಲೂ, ಫೋನ್‌ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಕಡೆಗೆ ತೋರಿಸಿ ಬೇರೊಬ್ಬರು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ಮುಖ ಗುರುತಿಸುವಿಕೆ ಡೇಟಾ ಅಳಿಸುವುದೇ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿದ ಫೇಸ್ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಮತ್ತು ಸುರಕ್ಷಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ. ಅದನ್ನು ತೆಗೆದುಹಾಕಿದ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಪಿನ್, ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ಗುರುತಿಸುವಿಕೆ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ಅನಾಮಧೇಯ ಗುರುತಿಸುವಿಕೆ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE ಪಾಸ್‌ವರ್ಡ್ ಗುರುತಿಸುವಿಕೆ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"ಪಾಸ್‌ವರ್ಡ್‌ ತೋರಿಸು"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ಸ್ವಯಂ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ಈ ಸಾಧನದೊಂದಿಗೆ ವೈ-ಫೈ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"ಸಂಪರ್ಕಿಸುತ್ತಿದೆ…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ಇದು ನೀವೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ಇದು ನೀವೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ಸೂರ್ಯೋದಯದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ಡಾರ್ಕ್ ಥೀಮ್, ನಿಜವಾದ ಕಪ್ಪು ಬಣ್ಣವನ್ನು ಬಳಸುತ್ತದೆ, ಆದ್ದರಿಂದ ಬ್ಯಾಟರಿ ದೀರ್ಘ ಕಾಲ ಬಾಳಿಕೆ ಬರುತ್ತದೆ. ನೀವು ಸ್ಕ್ರೀನ್ ಆಫ್ ಮಾಡಿದ ನಂತರ, ಡಾರ್ಕ್‌ ಥೀಮ್ ವೇಳಾಪಟ್ಟಿಗಳು ಆನ್ ಆಗುತ್ತವೆ."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ಡಾರ್ಕ್ ಥೀಮ್, ಕೆಲವು ಸ್ಕ್ರೀನ್‌ಗಳಲ್ಲಿ ಕಪ್ಪು ಹಿನ್ನೆಲೆಯನ್ನು ಬಳಸುತ್ತದೆ, ಆದ್ದರಿಂದ ಬ್ಯಾಟರಿ ದೀರ್ಘ ಕಾಲ ಬಾಳಿಕೆ ಬರುತ್ತದೆ. ನೀವು ಸ್ಕ್ರೀನ್ ಆಫ್ ಮಾಡಿದ ನಂತರ, ಡಾರ್ಕ್‌ ಥೀಮ್ ವೇಳಾಪಟ್ಟಿಗಳು ಆನ್ ಆಗುತ್ತವೆ."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ಸ್ಕ್ರೀನ್ ಅವಧಿ ಮುಕ್ತಾಯ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"ಪರದೆ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ಆದ ಮೇಲೆ"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪ್ಯಾಟರ್ನ್‌ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರು ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪಿನ್ ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ಪಿನ್‌ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಪುನಃ ಬರೆಯಿರಿ"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ಸ್ಕ್ರೀನ್‌ರೀಡರ್ ಮುಖ್ಯವಾಗಿ ದೃಷ್ಟಿಹೀನತೆ ಮತ್ತು ಕಡಿಮೆ ದೃಷ್ಟಿ ಹೊಂದಿರುವವರಿಗೆ ಸಹಾಯ ಮಾಡುತ್ತದೆ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ದೊಡ್ಡದಾಗಿ ಓದಲು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ ಮೇಲಿನ ಐಟಂಗಳನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ಶೀರ್ಷಿಕೆ ಆದ್ಯತೆಗಳು"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ಹಿಗ್ಗಿಸುವಿಕೆ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ಝೂಮ್ ಮಾಡಿ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ಝೂಮ್ ಮಾಡಿದ ಪ್ರದೇಶ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ಸರಿಸುವ ನಿಯಂತ್ರಕವನ್ನು ತೋರಿಸಿ"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ಝೂಮ್ ಮಾಡಿದ ಪ್ರದೇಶವನ್ನು ಸರಿಸಲು ಜಾಯ್‌ಸ್ಟಿಕ್-ಪ್ರಕಾರ ನಿಯಂತ್ರಕವನ್ನು ತೋರಿಸಿ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಜೂಮ್ ಮಾಡಿ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ಶಾರ್ಟ್‌ಕಟ್ ಮತ್ತು ಮೂರು-ಟ್ಯಾಪ್ ಮೂಲಕ ಹಿಗ್ಗಿಸಿ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"ನನ್ನ ಝೂಮ್ ಕುರಿತು"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ಆಯ್ಕೆಗಳು"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ಪರದೆಯನ್ನು ಝೂಮ್ ಇನ್ ಮಾಡಿ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ಝೂಮ್ ಮಾಡಲು 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ಝೂಮ್ ಮಾಡಲು ಒಂದು ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="color_orange" msgid="216547825489739010">"ಕಿತ್ತಳೆ"</string>
     <string name="color_purple" msgid="6603701972079904843">"ನೇರಳೆ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ಗುಲಾಬಿ ಬಣ್ಣ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ಯಾವುದೇ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ಸಿಮ್‌ ಸ್ಥಿತಿ"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ಸಿಮ್ ಸ್ಥಿತಿ (ಸಿಮ್ ಸ್ಲಾಟ್ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ಸಕ್ರಿಯಗೊಂಡಿವೆ</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ವಿನಾಯಿತಿಗಳು"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ದೃಶ್ಯ ಅಡಚಣೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ದೃಶ್ಯ ಸಂಕೇತಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಆನ್‌ ಇರುವಾಗ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ಅಡಚಣೆಗಳ ಧ್ವನಿಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ಧ್ವನಿ ಇಲ್ಲ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುತ್ತೀರಿ"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"ಸಾಧನವನ್ನು ಮ್ಯೂಟ್ ಮಾಡಿ ಆದರೆ ವಿನಾಯಿತಿಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ವಿನಾಯಿತಿಗಳು"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"ವೇಳಾಪಟ್ಟಿ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ಎಲ್ಲಾ ವಿನಾಯಿತಿಗಳನ್ನು ನೋಡಿ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್‌ ಇರುವಾಗ ವಿನಾಯಿತಿಗಳು"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"ಜನರು"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"ಅಲಾರಾಂಗಳು &amp; ಇತರೆ ಅಡಚಣೆಗಳು"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"ವೇಳಾಪಟ್ಟಿಗಳು"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ನಿಶ್ಶಬ್ದಗೊಳಿಸಲಾದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ಹೊರತುಪಡಿಸಿ ಎಲ್ಲವನ್ನೂ ಮ್ಯೂಟ್ ಮಾಡಿ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ಮ್ಯೂಟ್‌ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"ಸಂವಾದಗಳು"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"ಸಂದೇಶಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ಅನುಮತಿಸಲಾದ ಸಂದೇಶಗಳು ಬಂದಾಗ ಧ್ವನಿ ಕೇಳಿಸುವುದನ್ನು ಖಚಿತಪಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ರಿಂಗ್, ವೈಬ್ರೇಟ್ ಅಥವಾ ನಿಶಬ್ದಕ್ಕೆ ಹೊಂದಿಸಲಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ಗಾಗಿ ಒಳಬರುವ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿ ನೀಡುವಂತೆ ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ಯಾವುದೇ ಕರೆಗಳಿಗೆ ಅನುಮತಿಸಬೇಡಿ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ಯಾವುದೇ ಸಂದೇಶಗಳನ್ನು ಅನುಮತಿಸಬೇಡಿ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"ಅಲಾರಮ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ಅಲಾರಮ್‌ಗಳು"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ಟೈಮರ್‌ಗಳು, ಅಲಾರಾಂಗಗಳು, ಭದ್ರತಾ ವ್ಯವಸ್ಥೆಗಳು ಮತ್ತು ಇತರ ಆ್ಯಪ್‌ಗಳಿಂದ"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ಅಲಾರಮ್‌ಗಳು"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"ಮಾಧ್ಯಮದ ಧ್ವನಿಗಳನ್ನು ಪ್ಲೇ ಮಾಡಿ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"ಮೀಡಿಯಾ ಧ್ವನಿಗಳು"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ವೀಡಿಯೊಗಳು, ಗೇಮ್‌ಗಳು ಮತ್ತು ಇತರೆ ಮೀಡಿಯಾದಿಂದ"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ಮಾಧ್ಯಮ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳು"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ನಿಮ್ಮ ಕೀಬೋರ್ಡ್ ಮತ್ತು ಇತರೆ ಬಟನ್‌ಗಳಿಂದ"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳು"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"ಜ್ಞಾಪನೆಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"ಜ್ಞಾಪನೆಗಳು"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ಕಾರ್ಯಗಳು ಮತ್ತು ಜ್ಞಾಪನೆಗಳಿಂದ"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ಜ್ಞಾಪನೆಗಳು"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ಈವೆಂಟ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ಈವೆಂಟ್‌ಗಳು"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ಮುಂಬರಲಿರುವ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳಿಂದ"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ಅತಿಕ್ರಮಿಸಲು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ಆ್ಯಪ್‌ ವಿನಾಯಿತಿಗಳು"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಿ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"‍ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ನೀವು ಬಳಸುತ್ತಿರುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುವುದರ ಮೇಲೆ ಇದು ಪರಿಣಾಮ ಬೀರಬಹುದು ಅಥವಾ ಅವು ಕಾಣಿಸುವ ಅಥವಾ ವರ್ತಿಸುವ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳ ಪ್ರವೇಶ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ಎಲ್ಲಾ ಫೈಲ್‌ ನಿರ್ವಹಿಸಲು, ಪ್ರವೇಶಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ಈ ಸಾಧನ ಅಥವಾ ಕನೆಕ್ಟ್ ಮಾಡಿದ ಶೇಖರಣಾ ವಾಲ್ಯೂಮ್‌ಗಳಲ್ಲಿ ಎಲ್ಲಾ ಫೈಲ್‌ಗಳನ್ನು ಓದಲು, ಮಾರ್ಪಡಿಸಲು ಮತ್ತು ಅಳಿಸಲು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಿ. ಅನುಮತಿಸಿದರೆ, ಬಳಕೆದಾರರ ಪೂರ್ವಾನುಮತಿ ಇಲ್ಲದೆ ಆ್ಯಪ್‌ಗಳು ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"ವಿಆರ್ ವರ್ಚುವಲ್ ರಿಯಾಲಿಟಿ ಕೇಳುವಿಕೆ ಸ್ಟೀರಿಯೊ ಸಹಾಯ ಸೇವೆ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_0">%1$d</xliff:g> ಅಪ್ಲಿಗಳಿಗೆ ಇತರ ಅಪ್ಲಿಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಅನುಮತಿಯಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59c14f0..2f744b2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"내 위치, 화면 잠금해제, SIM 카드 잠금, 사용자 인증 정보 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"내 위치, 화면 잠금해제, 사용자 인증 정보 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"개인정보 보호"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"관리자가 사용 중지함"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"사용할 수 없습니다."</string>
     <string name="security_status_title" msgid="6958004275337618656">"보안 상태"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"화면 잠금, 얼굴인식 잠금해제"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"화면 잠금, 지문"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"앱에서 얼굴인식 잠금해제를 사용할 때 항상 확인 요청"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"얼굴 데이터 삭제"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"얼굴인식 잠금해제 설정"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요.\n\n주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 눈을 뜨고 있는 내 얼굴에 휴대전화를 가져다 대도 잠금이 해제될 수 있습니다\n\n일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요.\n\n주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 잠금이 해제될 수 있습니다.\n\n나와 많이 닮은 사람(예: 일란성 쌍둥이)이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요.\n\n주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 눈을 감고 있더라도 잠금이 해제될 수 있습니다.\n\n일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"얼굴 데이터를 삭제하시겠습니까?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"얼굴인식 잠금해제에 사용되는 얼굴 데이터가 영구적으로 안전하게 삭제됩니다. 삭제한 후 휴대전화를 잠금 해제하고 앱에 로그인하거나 결제를 확인하려면 PIN, 패턴 또는 비밀번호가 필요합니다."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"익명 ID"</string>
     <string name="wifi_password" msgid="1458802324849513755">"비밀번호"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE 비밀번호 식별자"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"비밀번호 표시"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP 대역 선택"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"자동"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"이 기기와 Wi‑Fi 공유 중…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"연결 중…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"핫스팟 공유"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"본인 확인"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"본인 인증하기"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"켜짐/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"자동으로 끄지 않음"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"일출에 자동으로 끄기"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"어두운 테마는 배터리 사용 시간을 늘리기 위해 완전한 블랙을 사용하며, 화면이 꺼질 때까지 기다린 후 켜집니다."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"어두운 테마는 배터리 사용 시간을 늘리기 위해 일부 화면에서 검은색 배경을 사용합니다. 어두운 테마 일정은 화면이 꺼질 때까지 기다린 후 켜집니다."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"화면 자동 잠금 시간"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"화면이 꺼짐"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN 설정 후 지문 사용"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"보안을 위해 패턴을 설정하세요."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"비밀번호 다시 입력"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"직장 비밀번호 입력"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"패턴 확인"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"직장 패턴 입력"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN 다시 입력"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"직장 PIN 입력"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"비밀번호가 일치하지 않음"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN이 일치하지 않음"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"패턴을 다시 그려 주세요"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"주로 시각 장애가 있는 사용자를 위한 스크린 리더"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"화면에서 항목을 탭하여 읽는 소리 듣기"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"자막 환경설정"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"확대"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"확대"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"확대 영역"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"이동 컨트롤러 표시"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"확대 영역을 이동하기 위한 조이스틱 같은 컨트롤러 표시"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"확대 설정"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"바로가기 및 세 번 탭으로 확대"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"확대 정보"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"옵션"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"화면 확대"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"3번 탭하여 확대"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"버튼을 탭하여 확대/축소"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM 카드 선택"</string>
     <string name="color_orange" msgid="216547825489739010">"주황색"</string>
     <string name="color_purple" msgid="6603701972079904843">"보라색"</string>
+    <string name="color_pink" msgid="8596872110888626708">"분홍색"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM 카드가 장착되지 않음"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM 상태"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM 상태(SIM 슬롯 %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1개 사용 설정됨</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"방해 금지 모드 사용 설정"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"예외"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"시각적 방해 차단"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"시각적 신호 허용"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"방해 금지 모드 사용 시"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"소리를 내는 방해 요소 허용"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"알림 제한"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"알림 소리 차단"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"화면에 알림을 표시합니다."</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>개의 예약이 자동으로 설정될 수 있습니다.</item>
       <item quantity="one">1개의 예약이 자동으로 설정될 수 있습니다.</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"기기를 음소거하되 예외 허용"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"예외"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"예약"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"예외 모두 보기"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"방해 금지 모드 사용 시 예외"</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_schedule" msgid="2003707171924226212">"일정"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"무음으로 설정된 알림"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"방해 금지 모드가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 소리 및 진동이 꺼집니다."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"다음을 제외하고 모두 음소거"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"음소거됨"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">외 <xliff:g id="NUM_PEOPLE">%d</xliff:g>명</item>
       <item quantity="one">외 1명</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"대화"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"메시지 허용"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"허용된 메시지를 놓치지 않도록 기기가 벨소리, 진동, 무음 중 무엇으로 설정되어 있는지 확인하세요."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"예약된 시간(‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\')에 수신 메시지가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자의 연락을 허용할 수 있습니다."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"없음"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"통화 허용 안함"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"메시지 허용 안함"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"알람 허용"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"알람"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"타이머, 알람, 보안 시스템 등의 앱"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"알람"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"미디어 소리 재생"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"미디어 소리"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"동영상, 게임 등의 미디어"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"미디어"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"터치음 허용"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"터치음"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"키보드 및 기타 버튼"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"터치음"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"알림 허용"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"알림"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"작업 및 알림"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"알림"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"일정 알림 허용"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"일정"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"예정된 캘린더 일정"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"앱에서 무시하도록 허용"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"앱 예외"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"다른 앱 위에 표시"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"다른 앱 위에 표시 허용"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"이 앱이 사용 중인 다른 앱 위에 표시되도록 허용합니다. 이로 인해 다른 앱 사용에 방해를 받거나 앱의 표시 또는 작동 방식이 변경될 수도 있습니다."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"모든 파일에 액세스"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"모든 파일 관리 허용"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"앱이 이 기기 또는 연결된 모든 저장장치에 있는 파일을 모두 읽고 수정하고 삭제하도록 허용합니다. 권한을 부여하면 앱이 나에게 명시적으로 알리지 않고도 파일에 액세스할 수 있습니다."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"모든 파일에 액세스 가능"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR 가상 현실 리스너 스테레오 도우미 서비스"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"다른 앱 위에 표시"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>개 앱 중 다른 앱 위에 표시하도록 허용된 앱 <xliff:g id="COUNT_0">%1$d</xliff:g>개"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 749f4f6..bd5c5ae 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Купуялык"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Администратор өчүрүп койгон"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Жеткиликсиз"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Коопсуздук абалы"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды кулпулоо, жүзүнөн таануу"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды кулпулоо, манжа изи"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Жүзүнөн таануу функциясы колдонулганда, ар дайым ырастоо талап кылынат"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Жүздүн дайындарын өчүрүү"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Жүзүнөн таануу функциясын жөндөө"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"\"Жүзүнөн таануу\" функциясы аркылуу түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастай аласыз.\n\nКөңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз ачылып турганда телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош (мисалы, эгизиңиз) адам ачып алышы мүмкүн."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"\"Жүзүнөн таануу\" функциясы аркылуу түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастай аласыз.\n\nКөңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз ачылып турганда телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"\"Жүзүнөн таануу\" функциясы аркылуу түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастай аласыз.\n\nКөңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз жумулуп турганда да, телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош (мисалы, эгизиңиз) адам ачып алышы мүмкүн."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Жүзүңүздү таануу дайындарын өчүрөсүзбү?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Жүзүнөн таануу функциясын колдонууда топтолгон дайын-даректер биротоло өчүрүлөт. Өчүрүлгөндөн кийин, телефонуңуздун кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастоо үчүн, PIN кодуңуз, графикалык ачкычыңыз же сырсөзүңүз суралат."</string>
@@ -585,7 +585,7 @@
     <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> колонмосу жаңы графикалык ачкычты, PIN кодду же сырсөздү сунуштайт, ансыз талапка ылайык иштебеши мүмкүн"</string>
     <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу экрандын жаңы кулпусун сунуштайт"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> аракеттен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
-    <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"Дайындарыңыз жок кылынат"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"Дайын-даректериңиз жок кылынат"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
     <string name="lock_last_pin_attempt_before_wipe_device" msgid="2815681042623708775">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="985126164175708507">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Идентификация"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Аныктыгы жашыруун"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Сырсөз"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Сырсөздөрдүн аныктыгын бир убакта текшерүү (SAE) идентификатору"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Сырсөздү көрсөтүү"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Wi-Fi жыштыгынын диапазону"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Авто"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi бул түзмөк менен бөлүшүлүүдө…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Туташууда…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Жалпы байланыш түйүнү"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Өзүңүздү ырастаңыз"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Сиз экениңизди ырастаңыз"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Эч качан автоматтык түрдө өчпөйт"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Күн чыкканда автоматтык түрдө өчөт"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Караңгы тема батареяңызды көпкө жеткирүү үчүн кара түстү колдонот. Мындан тышкары, анын качан күйүп, өчө турганын көрсөтө аласыз."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Караңгы тема айрым түзмөктөрдө батареянын кубатын көпкө жеткирүү үчүн кара түстү колдонот. Караңгы тема экран өчкөндө күйөт."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Экранды автоөчүрүү"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Экран өчөт"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Манжа изин колдонуу үчүн PIN кодду коюңуз"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Коопсуздук үчүн графикалык ачкыч коюп алыңыз"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Сырсөзүңүздү кайра киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Жумуш профилиңиздин сырсөзүн киргизиңиз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Графикалык ачкычыңызды ырастаңыз"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Жумуш профилиңиздин графикалык ачкычын киргизиңиз"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN кодуңузду кайра киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Жумуш профилиңиздин PIN кодун киргизиңиз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Сырсөздөр дал келген жок"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN коддор дал келген жок"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Графикалык ачкычты кайрадан тартыңыз"</string>
@@ -1793,9 +1797,9 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Бардк колднмо булактрна урукст"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"Акыркы ачылган колдонмолор"</string>
     <string name="see_all_apps_title" msgid="8363320482315507386">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
-    <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
-    <string name="install_all_warning" product="default" msgid="652516435709047343">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
-    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Түзмөгүңүз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуп, түзмөгүңүзгө кандайдыр бир зыян келтирип алсаңыз же дайын-даректериңизди жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Планшетиңиз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайын-даректериңизды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="default" msgid="652516435709047343">"Телефонуңуз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайын-даректериңизды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Түзмөгүңүз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуп, түзмөгүңүзгө кандайдыр бир зыян келтирип алсаңыз же дайын-даректериңизди жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Өркүндөтүлгөн жөндөөлөр"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Көбүрөөк тууралоо опцияларын көрсөтүү"</string>
     <string name="application_info_label" msgid="1015706497694165866">"Колдонмо тууралуу"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Экрандагы нерсени окуп берүүчү курал көздөрү начар көргөн адамдарга арналган"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Экраныңыздагы элементтерди түзмөк окуп бериши үчүн аларды таптап коюңуз"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Коштомо жазуулардын жеке жөндөөлөрү"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Чоңойтуу"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Чоңойтуу"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Чоңойтуу аймагы"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Жылдыруу көзөмөлдөгүчүн көрсөтүү"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Чоңойтуу аймагын жылдыруу үчүн джойстик сыяктуу көзөмөлдөгүчтү көрсөтүү"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Чоңойтуунун жөндөөлөрү"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ыкчам баскыч жана үч жолу таптоо менен чоңойтуу"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Чоңойтуу жөнүндө маалымат"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Параметрлер"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Экранды чоңойтуу"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Өлчөмүн өзгөртүү үчүн 3 жолу таптаңыз"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Чоңойтуп/кичирейтүү үчүн баскычты басыңыз"</string>
@@ -2557,7 +2563,7 @@
     <string name="menu_proc_stats_type_cached" msgid="1351321959600144622">"Кэштелген"</string>
     <string name="voice_input_output_settings" msgid="1055497319048272051">"Үн киргизүү жана чыгаруу"</string>
     <string name="voice_input_output_settings_title" msgid="6449454483955543064">"Үн киргизүү жана чыгаруунун жөндөөлөрү"</string>
-    <string name="voice_search_settings_title" msgid="228743187532160069">"Үн менен издөө"</string>
+    <string name="voice_search_settings_title" msgid="228743187532160069">"Айтып издөө"</string>
     <string name="keyboard_settings_title" msgid="2199286020368890114">"Android тергичи"</string>
     <string name="voice_input_settings" msgid="105821652985768064">"Айтып киргизүү жөндөөлөрү"</string>
     <string name="voice_input_settings_title" msgid="3708147270767296322">"Айтып киргизүү"</string>
@@ -2647,7 +2653,7 @@
     <string name="device_admin_status" msgid="6332571781623084064">"Администратордун колдонмосу иштетилген жана <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна төмөнкү аракеттерди аткарууга уруксат берет:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"Профиль башкаргычы жандырылсынбы?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Көзөмөлгө уруксат берилсинби?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Улантсаңыз, профилиңизди администратор башкарып, ал жеке дайындарыңыз менен кошо башка тийиштүү дайындарды да сактап турат.\n\nАдминистратор бул колдонуучунун жөндөөлөрүн, кирүү мүмкүнчүлүгүн, колдонмолорду жана дайындарды, ошондой эле тармактагы аракеттер менен түзмөгүңүздүн жайгашкан жери тууралуу маалыматты көзөмөлдөп, башкара алат."</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Улантсаңыз, профилиңизди администратор башкарып, ал жеке дайын-даректериңиз менен кошо башка тийиштүү дайындарды да сактап турат.\n\nАдминистратор бул колдонуучунун жөндөөлөрүн, кирүү мүмкүнчүлүгүн, колдонмолорду жана дайындарды, ошондой эле тармактагы аракеттер менен түзмөгүңүздүн жайгашкан жери тууралуу маалыматты көзөмөлдөп, башкара алат."</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"Башка параметрлер администратор тарабынан өчүрүлгөн"</string>
     <string name="admin_more_details" msgid="6698424974827333973">"Көбүрөөк маалымат"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"Билдирмелер таржымалы"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM карта тандаңыз"</string>
     <string name="color_orange" msgid="216547825489739010">"Кызгылт сары"</string>
     <string name="color_purple" msgid="6603701972079904843">"Кызгылт көгүш"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Кызгылтым"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM карта кыстарылган эмес"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM абалы"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-картанын абалы (SIM-карта оюкчасы %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 ырааттама иштетилди</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Тынчымды алба\" режимин күйгүзүү"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Өзгөчө учурлар:"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Визуалдык эскертмелерди бөгөттөө"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуалдык сигнал иштетилсин"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"\"Тынчымды алба\" режими күйүп турганда"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Үнү чыгарылган билдирмелерге уруксат берүү"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Билдирмелерди чектөө"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Билдирмелердин добушу чыкпайт"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Билдирмелерди экранда көрөсүз"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ырааттама автоматтык түрдө иштетилет</item>
       <item quantity="one">1 ырааттама автоматтык түрдө иштетилет</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Түзмөктүн үнүн басып, бирок өзгөчө жөндөөлөргө уруксат берүү"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Өзгөчө учурлар"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ырааттама"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Өзгөчө учурларды көрүү"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"\"Тынчымды алба\" режими күйүп тургандагы өзгөчө учурлар"</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_schedule" msgid="2003707171924226212">"Графиктер"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Үнү өчүрүлгөн билдирмелер"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары нерселердин үнү чыкпайт жана дирилдебейт."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Төмөнкүлөрдөн тышкары баарынын үнүн басуу:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Үнүн басуу"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Башка <xliff:g id="NUM_PEOPLE">%d</xliff:g> байланыш</item>
       <item quantity="one">Башка 1 байланыш</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Жазышуулар"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Билдирүүлөргө уруксат берүү"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Маанилүү билдирүүлөрдү өткөрүп жибербеш үчүн түзмөгүңүздүн үнүн чыгарып коюңуз же дирилдөөнү иштетиңиз."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси иштетилгенде, билдирүүлөр алынбайт. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүн алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Эч бир"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Чалууларга тыюу салуу"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Бардык билдирүүлөргө тыюу салынат"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Ойготкучтарга уруксат берүү"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Ойготкучтар"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Таймерлерден, ойготкучтардан, коопсуздук тутумдарынан жана башка колдонмолордон"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ойготкучтар"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Медиа добуштарын ойнотуу"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Медиа добуштар"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Видеолордон, оюндардан жана башка медиадан"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"медиа"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Экранга тийгенде чыккан үндөргө уруксат берүү"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Экранга тийгенде үн чыксын"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Баскычтоптон жана башка баскычтардан"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"экранга тийгенде чыккан үндөр"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Эскеткичтерге уруксат берүү"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Эстеткичтер"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Тапшырмалардан жана эстеткичтерден"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"эстеткичтер"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Иш-чараларга уруксат берүү"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Иш-чаралар"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Жылнаамадагы боло турган иш-чаралардан"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Колдонмолорго өзгөртүп коюуга уруксат берүү"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Колдонмодогу өзгөчө жөндөөлөр"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3741,7 +3757,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> кошумча уруксат</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Эч уруксат берилген жок"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Эч уруксат суралган жок"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Колдонмо уруксат сурай элек"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Бардык колдонмолор"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"Орнотулган колдонмолор"</string>
     <string name="filter_instant_apps" msgid="2292108467020380068">"Ыкчам ачылуучу колдонмолор"</string>
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Башка терезелердин үстүнөн көрсөтүү"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Башка терезелердин үстүнөн көрсөтүүгө уруксат"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Бул колдонмону башка терезелердин үстүнөн көрсөтүүгө уруксат бериңиз. Бирок башка колдонмолорду пайдаланууга тоскоол болуп же алардын интерфейсин бузуп салышы мүмкүн."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Бардык файлдарга кирүү мүмкүнчүлүгү"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Бардык башкарылган файлдарга кирүү мүмкүнчүлүгүн берүү"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Бул колдонмого түзмөктөгү же башка туташтырылган сактагычтардагы файлдарды окууга, өзгөртүүгө жана жок кылууга уруксат берүү. Эгер уруксат берилсе, колдонмонун файлдарга атайын уруксатыңызды сурабастан кирүү мүмкүнчүлүгү болот."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Бардык файлдарга кирүү мүмкүнчүлүгү бар"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуалдык дүйнө режими көмөкчү кызмат"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Башка терезел-н үст-н көрсөтүү"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> колдонмодон <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмо башка терезелердин үстүнөн көрсөтүлөт"</string>
@@ -4365,7 +4385,7 @@
     <string name="storage_size_large_alternate" msgid="7555149858858591495">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="7102720999351050601">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
     <string name="storage_percent_full" msgid="7211888326013020857">"колдонулду"</string>
-    <string name="clear_instant_app_data" msgid="5951258323364386357">"Колдонмонун дайындарын тазалоо"</string>
+    <string name="clear_instant_app_data" msgid="5951258323364386357">"Колдонмонун дайын-даректерин тазалоо"</string>
     <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Бул ыкчам ачылуучу колдонмо алынып салынсынбы?"</string>
     <string name="launch_instant_app" msgid="8503927414339606561">"Ачуу"</string>
     <string name="game_storage_settings" msgid="2521393115726178837">"Оюндар"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 159af58..256328a 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ຄວາມເປັນສ່ວນຕົວ"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ບໍ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ສະຖານະຄວາມປອດໄພ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ລັອກໜ້າຈໍ, ການປົດລັອກດ້ວຍໃບໜ້າ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ການລັອກໜ້າຈໍ, ລາຍນິ້ວມື"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ເມື່ອໃຊ້ການປົດລັອກດ້ວຍໜ້າໃນແອັບຕ່າງໆ, ໃຫ້ຢືນຢັນນຳທຸກເທື່ອ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ລຶບຂໍ້ມູນໃບໜ້າອອກ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ.\n\nກະລຸນາຮັບຊາບວ່າ:\nການເບິ່ງໂທລະສັບສາມາດປົດລັອກມັນໄດ້ໂດຍທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານໃນຂະນະທີ່ທ່ານມືນຕາຢູ່.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນທີ່ໜ້າຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ລູກຂອງທ່ານ ຫຼື ອ້າຍນ້ອງທີ່ເປັນຝາແຝດ."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ.\n\nກະລຸນາຮັບຊາບວ່າ:\nການເບິ່ງໂທລະສັບສາມາດປົດລັອກມັນໄດ້ໂດຍທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນທີ່ໜ້າຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ລູກຂອງທ່ານ ຫຼື ອ້າຍນ້ອງທີ່ເປັນຝາແຝດ."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ.\n\nກະລຸນາຮັບຊາບວ່າ:\nການເບິ່ງໂທລະສັບສາມາດປົດລັອກມັນໄດ້ໂດຍທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານ, ເຖິງແມ່ນວ່າທ່ານຈະກຳລັງຫຼັບຕາຢູ່ກໍຕາມ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນທີ່ໜ້າຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ລູກຂອງທ່ານ ຫຼື ອ້າຍນ້ອງທີ່ເປັນຝາແຝດ."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ລຶບຂໍ້ມູນໃບໜ້າອອກບໍ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ຂໍ້ມູນໃບໜ້າທີ່ໃຊ້ໂດຍປົດລັອກດ້ວຍໜ້າຈະຖືກລຶບອອກຢ່າງຖາວອນ ແລະ ປອດໄພ. ຫຼັງຈາກການລຶບແລ້ວ, ທ່ານຈະຕ້ອງໃຊ້ PIN, ຮູບແບບປົດລັອກ ຫຼື ລະຫັດຜ່ານໃນການປົດລັອກໂທລະສັບ, ການລົງຊື່ເຂົ້າໃຊ້ແອັບ ແລະ ການຢືນຢັນການຈ່າຍເງິນ."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ການລະບຸໂຕຕົນ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ໂຕຕົນທີ່ບໍ່ລະບຸຊື່"</string>
     <string name="wifi_password" msgid="1458802324849513755">"ລະຫັດຜ່ານ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"ຕົວລະບຸລະຫັດຜ່ານ SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"ສະແດງລະຫັດຜ່ານ"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"ເລືອກ​ຄື້ນ AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ອັດຕະໂນມັດ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ກຳລັງແບ່ງປັນ Wi‑Fi ກັບອຸປະກອນນີ້…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"ກຳລັງເຊື່ອມຕໍ່…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ແບ່ງປັນຮັອດສະປອດ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ຢືນຢັນວ່າແມ່ນທ່ານ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ຢັ້ງຢືນວ່າແມ່ນທ່ານ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ຈະບໍ່ປິດອັດຕະໂນມັດ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ຈະປິດອັດຕະໂນມັດເມື່ອຕາເວັນຂຶ້ນ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ຮູບແບບສີສັນມືດຈະໃຊ້ສີດຳແບບແທ້ໆເພື່ອຊ່ວຍຍືດອາຍຸແບັດເຕີຣີຂອງທ່ານໃຫ້ຢູ່ໄດ້ດົນຂຶ້ນ. ກຳນົດເວລາຮູບແບບສີສັນມືດຈະລໍຖ້າເປີດຈົນກວ່າໜ້າຈໍຂອງທ່ານຈະປິດ."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ຮູບແບບສີສັນມືດຈະໃຊ້ພື້ນຫຼັງສີດຳເພື່ອຊ່ວຍເຮັດໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ດົນຂຶ້ນໃນໜ້າຈໍບາງຮຸ່ນ. ກຳນົດເວລາຮູບແບບສີສັນມືດຈະລໍຖ້າເປີດຈົນກວ່າໜ້າຈໍຂອງທ່ານຈະປິດ."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ໄລຍະໝົດເວລາໜ້າຈໍ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"​ປິດ​ໜ້າ​ຈໍ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກໄວ້"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານອີກຄັ້ງ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ໃສ່ລະຫັດຜ່ານບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ຢືນຢັນຮູບແບບຂອງທ່ານ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ໃສ່ຮູບແບບບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ໃສ່ລະຫັດ PIN ຂອງທ່ານອີກຄັ້ງ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ໃສ່ PIN ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"ລະຫັດຜ່ານບໍ່ກົງກັນ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ລະຫັດ PIN ບໍ່ກົງກັນ"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານອີກເທື່ອໜຶ່ງ"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ໂປຣແກຣມອ່ານໜ້າຈໍໂດຍຕົ້ນຕໍສຳລັບຄົນທີ່ຕາບອດ ແລະ ເບິ່ງເຫັນບໍ່ໄດ້ດີ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ແຕະລາຍການໃນໜ້າຈໍຂອງທ່ານເພື່ອຟັງອອກສຽງ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ການຕັ້ງຄ່າຄຳບັນຍາຍ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ການຂະຫຍາຍ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ການຂະຫຍາຍ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ພື້ນທີ່ການຂະຫຍາຍ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ສະແດງຕົວຄວບຄຸມການຍ້າຍ"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ສະແດງຕົວຄວບຄຸມທີ່ຄ້າຍຈອຍສະຕິກເພື່ອຍ້າຍພື້ນທີ່ການຂະຫຍາຍ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ການຕັ້ງຄ່າການຂະຫຍາຍ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ຂະຫຍາຍດ້ວຍທາງລັດ ແລະ ການແຕະສາມເທື່ອ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"ກ່ຽວກັບການຂະຫຍາຍ"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ຕົວເລືອກ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ຊູມເຂົ້າໃນໜ້າຈໍ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ແຕະ 3 ຄັ້ງເພື່ອຊູມ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ແຕະປຸ່ມເພື່ອຊູມ"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ເລືອກ SIM ກາດ"</string>
     <string name="color_orange" msgid="216547825489739010">"ສີສົ້ມ"</string>
     <string name="color_purple" msgid="6603701972079904843">"ສີມ່ວງ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ສີບົວ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ບໍ່​ໄດ້​ໃສ່ SIM ກາດ"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ສະ​ຖາ​ນະ SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ສະຖານະ SIM (ຊິມຊ່ອງ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">ເປີດໃຊ້ 1 ລາຍການແລ້ວ</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ເປີດໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ຂໍ້ຍົກເວັ້ນ"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ບລັອກການລົບກວນທາງພາບ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ອະນຸຍາດສັນຍານພາບ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ອະນຸຍາດການລົບກວນທີ່ມີສຽງ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ຈຳກັດການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ບໍ່ມີສຽງຈາກການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ທ່ານຈະເຫັນການແຈ້ງເຕືອນຢູ່ໜ້າຈໍຂອງທ່ານ"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other">ສາມາດເປີດໃຊ້ <xliff:g id="ON_COUNT">%d</xliff:g> ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
       <item quantity="one">ສາມາດເປີດໃຊ້ 1 ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"ປິດສຽງອຸປະກອນແຕ່ອະນຸຍາດໃຫ້ມີຂໍ້ຍົກເວັ້ນໄດ້"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ຂໍ້ຍົກເວັ້ນ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"ຕັ້ງເວລາ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ເບິ່ງການຍົກເວັ້ນທັງໝົດ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"ຂໍ້ຍົກເວັ້ນເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ"</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_schedule" msgid="2003707171924226212">"ກຳນົດການ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ປິດສຽງການແຈ້ງເຕືອນແລ້ວ"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ, ສຽງ ແລະ ການສັ່ນເຕືອນຈະຖືກປິດໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ປິດສຽງທັງໝົດຍົກເວັ້ນ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ປິດແລ້ວ"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">ອີກ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ຄົນ</item>
       <item quantity="one">ອີກ 1 ຄົນ</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"ການສົນທະນາ"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"ອະນຸຍາດຂໍ້ຄວາມ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ເພື່ອກວດສອບວ່າຂໍ້ຄວາມທີ່ໄດ້ຮັບອະນຸຍາດຈະມີສຽງ, ໃຫ້ກວດສອບວ່າທ່ານຕັ້ງໂທລະສັບຂອງທ່ານໃຫ້ມີສຽງຂໍ້ຄວາມເຂົ້າ, ສັ່ນເຕືອນ ຫຼື ງຽບ."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ສຳລັບ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, ຂໍ້ຄວາມຂາເຂົ້າຈະຖືກບລັອກໄວ້. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ບໍ່ມີ"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ບໍ່ອະນຸຍາດການໂທ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ບໍ່ອະນຸຍາດການສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"ອະນຸຍາດໂມງປຸກ"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ໂມງປຸກ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ຈາກໂມງຈັບເວລາ, ໂມງປຸກ, ລະບົບຄວາມປອດໄພ ແລະ ແອັບອື່ນໆ"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ໂມງປຸກ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"ຫຼິ້ນສຽງມີເດຍ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"ສຽງມີເດຍ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ຈາກວິດີໂອ, ເກມ ແລະ ມີເດຍອື່ນໆ"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ສື່"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ອະນຸຍາດໃຫ້ມີສຽງສຳຜັດ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"​ສຽງ​ສຳ​ຜັດ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ຈາກແປ້ນພິມ ແລະ ປຸ່ມອື່ນໆຂອງທ່ານ"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ສຽງການແຕະ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"ອະນຸຍາດການເຕືອນ"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"ການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ຈາກໜ້າວຽກ ແລະ ການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ອະນຸຍາດນັດໝາຍ"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ກິດຈະກຳ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ຈາກນັດໝາຍປະຕິທິນຕໍ່ໄປ"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ອະນຸຍາດໃຫ້ແອັບຍົກເລີກໄດ້"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ຂໍ້ຍົກເວັ້ນແອັບ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"ສະແດງແອັບບັງແອັບອື່ນ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"ອະນຸຍາດໃຫ້ສະແດງແອັບບັງແອັບອື່ນ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ອະນຸຍາດໃຫ້ແອັບນີ້ສະແດງບັງໜ້າແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່. ມັນອາດລົບກວນການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນຂອງທ່ານ."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ສິດການເຂົ້າເຖິງໄຟລ໌ທັງໝົດ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ອະນຸຍາດການເຂົ້າເຖິງເພື່ອຈັດການໄຟລ໌ທັງໝົດ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ອະນຸຍາດໃຫ້ແອັບນີ້ອ່ານ, ແກ້ໄຂ ແລະ ລຶບໄຟລ໌ທັງໝົດຢູ່ອຸປະກອນນີ້ ຫຼື ບ່ອນຈັດເກັບຂໍ້ມູນໃດກໍຕາມທີ່ເຊື່ອມຕໍ່ໄວ້. ຫາກໄດ້ຮັບອະນຸຍາດແລ້ວ, ແອັບຈະສາມາດເຂົ້າເຖິງໄຟລ໌ໂດຍແຈ້ງໃຫ້ທ່ານຮັບຮູ້ຢ່າງຈະແຈ້ງໄດ້."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ສາມາດເຂົ້າເຖິງໄຟລ໌ທັງໝົດ"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reality ຕົວຟັງ ສະເຕຣິໂອ ຕົວຊ່ວຍ ບໍລິການ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"ສະແດງແອັບບັງແອັບອື່ນ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="COUNT_1">%2$d</xliff:g> ແອັບແມ່ນອະນຸຍາດໃຫ້ສະແດງຜົນບັງແອັບອື່ນໄດ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f4eb872..1181ad4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, prisijungimo duomenų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatumas"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Išjungė administratorius"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nepasiekiama"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Saugos būsena"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrano užraktas, atrakinimas pagal veidą"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrano užraktas, piršto antspaudas"</string>
@@ -356,7 +356,7 @@
     <string name="face_intro_error_max" msgid="2474735057709291626">"Pridėjote maksimalų skaičių veidų"</string>
     <string name="face_intro_error_unknown" msgid="1626057493054989995">"Negalima pridėti daugiau veidų"</string>
     <string name="security_settings_face_enroll_error_dialog_title" msgid="2460820099922775936">"Registracija neužbaigta"</string>
-    <string name="security_settings_face_enroll_dialog_ok" msgid="1674650455786434426">"GERAI"</string>
+    <string name="security_settings_face_enroll_dialog_ok" msgid="1674650455786434426">"Gerai"</string>
     <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"Pasiektas veido registracijos laiko apribojimas. Bandykite dar kartą."</string>
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"Nepavyko užregistruoti veido."</string>
     <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"Viskas nustatyta. Atrodo gerai."</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Naudojant Atrakinimą pagal veidą programose, reikalauti patvirtinimo"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ištrinti veido duom."</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nustatyti Atrakinimą pagal veidą"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Naudodami Atrakinimą pagal veidą atrakinkite įrenginį, prisijunkite prie programų ir patvirtinkite mokėjimus.\n\nNepamirškite toliau nurodytų dalykų:\nŽiūrint į telefoną jis gali būt atrakintas, kai to neketinate atlikti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį prieš jus, kai esate atsimerkę.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Naudodami Atrakinimą pagal veidą atrakinkite įrenginį, prisijunkite prie programų ir patvirtinkite mokėjimus.\n\nNepamirškite toliau nurodytų dalykų\nŽiūrėdami į telefoną galite jį atrakinti net neketindami to daryti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį priešais jūsų veidą.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Naudodami Atrakinimą pagal veidą atrakinkite įrenginį, prisijunkite prie programų ir patvirtinkite mokėjimus.\n\nNepamirškite toliau nurodytų dalykų:\nŽiūrint į telefoną jis gali būt atrakintas, kai to neketinate atlikti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį prieš jus, net kai esate užsimerkę.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ištrinti veido duomenis?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Atrakinimo pagal veidą funkcijos naudojami veido duomenys bus visam laikui ir saugiai ištrinti. Pašalinus reikės PIN kodo, atrakinimo piešinio arba slaptažodžio norint atrakinti telefoną, prisijungti prie programų ir patvirtinti mokėjimus."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Tapatybė"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anoniminė tapatybė"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Slaptažodis"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE slaptaž. identifikatorius"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Rodyti slaptažodį"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Pasirinkti prieigos taško juostą"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatinė"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Bendrinamas „Wi‑Fi“ su šiuo įrenginiu…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Prisijungiama…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Viešosios interneto prieigos taško bendrinimas"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Savo tapatybės patvirtinimas"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Patvirtinkite, kad tai jūs"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Niekada nebus išjungta automatiškai"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Bus išjungta automatiškai saulei tekant"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tamsiojoje temoje naudojama tikroji juoda spalva, kad akumuliatorius ilgiau veiktų. Tamsiosios temos tvarkaraščiai neprasideda, kol ekranas neišsijungia."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tamsiojoje temoje naudojamas tamsus fonas, kad akumuliatorius ilgiau veiktų tam tikruose ekranuose. Tamsiosios temos tvarkaraščiai neprasideda, kol ekranas neišsijungia."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekrano skirtasis laikas"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Kad apsaugotumėte įrenginį, nupieškite atrakinimo piešinį"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Įveskite slaptažodį iš naujo"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Įveskite darbo profilio slaptažodį"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Patvirtinkite piešinį"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Nubr. darbo prof. atr. piešinį"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Įveskite PIN kodą iš naujo"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Įveskite darbo profilio PIN kodą"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Slaptažodžiai neatitinka"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN kodai neatitinka"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Nupieškite atrakinimo piešinį dar kartą"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Ekrano skaitytuvas pirmiausia skirtas akliems ar regos sutrikimų turintiems žmonėms"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Palieskite elementus ekrane, kad jie būtų skaitomi balsu"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitrų nuostatos"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Didinimas"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Didinti"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Didinimo sritis"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Rodyti perkėlimo valdiklį"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Rodyti vairasvirtę primenantį valdiklį, skirtą perkelti didinimo sritį"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Didinimo nustatymai"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Didinti naud. spart. klav. ir palietus tris kartus"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Apie didinimo funkciją"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Parinktys"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ekrano artinimas"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Palieskite 3 kartus, kad keistumėte mastelį."</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Palieskite mygtuką, kad keistumėte mastelį"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Pasirinkite SIM kortelę"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranžinė"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purpurinė"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rožinė"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nėra SIM kortelės"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM būsena"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM būsena (%1$d SIM lizdas)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="other">Įgalinta <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščių</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Netrukdymo režimo įjungimas"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Išimtys"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuoti vaizdinius trikdžius"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Leisti vaizdinius signalus"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kai įjungtas netrukdymo režimas"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Leisti pertrauktis, skleidžiančias garsą"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Apriboti pranešimus"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Neskambėti gavus pranešimų"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Matysite pranešimus ekrane"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Nutildyti įrenginį, bet leisti išimtis"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Išimtys"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Tvarkaraštis"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Žr. visas išimtis"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Išimtys, kai įjungtas netrukdymo režimas"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Žmonės"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Programos"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Signalai ir kitos pertrauktys"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Tvarkaraščiai"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Nutildyti pranešimai"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Įjungus netrukdymo režimą garsas ir vibravimas bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Nutildyti viską išskyrus"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Nutildyta"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Pokalbiai"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Leisti pranešimus"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Kad užtikrintumėte, jog įrenginys skambės priimant leidžiamus pranešimus, patikrinkite, ar jame nustatytas skambėjimo, vibravimo ar begarsis režimas."</string>
     <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>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nėra"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Neleisti jokių skambučių"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Neleisti jokių pranešimų"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Leisti signalus"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Signalai"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Iš laikmačių, signalų, saugos sistemų ir kitų programų"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"signalai"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Leisti medijos garsus"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Medijos garsai"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Iš vaizdo įrašų, žaidimų ir kitos medijos"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"medija"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Leisti palietimo garsus"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Lietimo garsai"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Iš klaviatūros ir kitų mygtukų"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"lietimo garsai"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Leisti priminimus"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Priminimai"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Iš užduočių ir priminimų"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"priminimai"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Leisti įvykius"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Įvykiai"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Iš būsimų kalendoriaus įvykių"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Leisti programoms nepaisyti"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Programų išimtys"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Rodoma virš kitų programų"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Leisti rodyti virš kitų programų"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Leisti šią programą pateikti virš kitų naudojamų programų. Tai gali trukdyti naudoti tas programas arba pakeisti, kaip jos atrodo ar veikia."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Visų failų prieiga"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Leisti pasiekti ir tvarkyti visus failus"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Šiai programai leidžiama nuskaityti, keisti ir ištrinti visus failus, esančius šiame įrenginyje ar bet kurioje prijungtoje saugykloje. Jei suteiksite leidimą, programa gali pasiekti failus jūsų tiksliai neinformavus."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Gali pasiekti visus failus"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtualiosios realybės apdorojimo priemonė stereofoninis garsas pagalbinė paslauga"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Rodyti virš kitų programų"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> iš <xliff:g id="COUNT_1">%2$d</xliff:g> progr. leidžiama rodyti virš kitų programų"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ad58067..7152c7f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Konfidencialitāte"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Atspējoja administrators"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nav pieejama"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Drošības statuss"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrāna bloķēšana, autorizācija pēc sejas"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrāna bloķēšana, pirksta nospiedums"</string>
@@ -374,7 +374,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Autorizējoties ar seju lietotnēs, vienmēr pieprasīt apstiprinājumu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Dzēst sejas datus"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Iestatīt autorizāciju pēc sejas"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Izmantojot autorizāciju pēc sejas, varat atbloķēt ierīci, pierakstīties lietotnēs un apstiprināt maksājumus.\n\nSvarīga informācija!\nSkatīšanās uz ekrānu var to nejauši atbloķēt.\n\nJūsu tālruni var atbloķēt kāds cits, ja to tur jūsu sejas priekšā, kad jūsu acis ir vaļā.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiska izskata brālis vai māsa."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Izmantojot autorizāciju pēc sejas, varat atbloķēt ierīci, pierakstīties lietotnēs un apstiprināt maksājumus.\n\nSvarīga informācija!\nPaskatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Izmantojot autorizāciju pēc sejas, varat atbloķēt ierīci, pierakstīties lietotnēs un apstiprināt maksājumus.\n\nSvarīga informācija!\nSkatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju, kad jūsu acis ir aizvērtas.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vai dzēst sejas datus?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Sejas dati, ar kuriem tiek veikta autorizācija pēc sejas, tiks neatgriezeniski un droši izdzēsti. Pēc noņemšanas jums būs jāizmanto PIN, kombinācija vai parole, lai atbloķētu tālruni, pierakstītos lietotnēs un apstiprinātu maksājumus."</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identifikācijas dati"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonīmi identifikācijas dati"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Parole"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE paroles identifikators"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Rādīt paroli"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Atlasīt piekļuves punkta joslu"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automātiski"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Notiek Wi‑Fi kopīgošana ar šo ierīci…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Notiek savienojuma izveide…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Tīklāja kopīgošana"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Apstipriniet, ka tas esat jūs"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Identitātes apstiprināšana"</string>
     <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" 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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ieslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nekad netiks automātiski izslēgts"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Tiks automātiski izslēgts saullēktā"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tumšajā motīvā tiek izmantota dabiska melnā krāsa, lai paildzinātu akumulatora darbību. Turklāt jūs varat iestatīt, kad ieslēgt un izslēgt tumšo motīvu."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tumšajā motīvā tiek izmantots melns fons noteiktos ekrānos, lai paildzinātu akumulatora darbību. Turklāt jūs varat iestatīt, kad ieslēgt un izslēgt tumšo motīvu."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekrāna noildze"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN pirksta nosp. lietošanai"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Drošības nolūkos iestatiet kombināciju."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Atkārtota paroles ievade"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ievadiet darba profila paroli"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Apstipriniet kombināciju"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ievadiet darba profila kombināciju"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Atkārtota PIN ievade"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ievadiet darba profila PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Paroles nav vienādas"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN kodi ir atšķirīgi"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Vēlreiz uzzīmējiet kombināciju"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Ekrāna lasītājs, kas galvenokārt paredzēts akliem un vājredzīgiem lietotājiem"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Pieskarieties vienumiem ekrānā, lai tie tiktu skaļi nolasīti."</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitru preferences"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Palielinājums"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Palielināšana"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Palielināšanas apgabals"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Pārvietošanas vadīklas rādīšana"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Rādīt kursorsvirai līdzīgu vadīklu, ar kuru var pārvietot palielināšanas apgabalu"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Palielināšanas iestatījumi"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Palieliniet, lietojot saīsni un trīskāršu skārienu"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Par palielināšanu"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcijas"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Tuvināt ekrānā"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Pieskarieties 3 reizes, lai veiktu tālummaiņu"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Pieskarieties pogai, lai palielinātu"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Atlasīt SIM karti"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranža"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violeta"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rozā"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nav ievietota neviena SIM karte."</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM kartes statuss"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM k. statuss (%1$d. SIM kartes slots)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> iespējotas</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Režīma “Netraucēt” ieslēgšana"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Izņēmumi"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloķēt vizuālos traucējumus"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizuālu signālu atļaušana"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kad ir ieslēgts režīms “Netraucēt”"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Atļaut pārtraukumus ar skaņas signālu"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Paziņojumu ierobežošana"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Nav skaņas signālu no paziņojumiem"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Jūs redzēsiet paziņojumus ekrānā."</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Izslēgt ierīces skaņu, bet atļaut izņēmumus"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Izņēmumi"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Grafiks"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Skatiet visus izņēmumus"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Izņēmumi, kad ir ieslēgts režīms “Netraucēt”"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Lietotnes"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Modinātāja signāli un citi signāli"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Grafiki"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Paziņojumi bez skaņas signāla"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Esot ieslēgtam režīmam Netraucēt, tiks izslēgta skaņa un vibrācija, izņemot jūsu atļautajiem vienumiem."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Izslēgt skaņu visam, izņemot"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Izslēgta skaņa"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Sarunas"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Ziņojumu atļaušana"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Lai dzirdētu atļauto īsziņu signālu, pārbaudiet, vai ierīcei ir iestatīts zvana signāls, vibrācija vai klusuma režīms."</string>
     <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>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nav"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Neatļaut nekādus zvanus"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Neatļaut nekādas īsziņas"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Atļaut signālus"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Signāli"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"No taimeriem, modinātājiem, drošības sistēmām un citām lietotnēm"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"signāli"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Atskaņot multivides skaņas"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Multivides skaņas"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"No videoklipiem, spēlēm un cita multivides satura"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multivide"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Atļaut pieskārienu skaņas"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Pieskāriena skaņas"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"No tastatūras un citām pogām"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"pieskāriena skaņas"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Atļaut atgādinājumu skaņas"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Atgādinājumi"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"No uzdevumiem un atgādinājumiem"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"atgādinājumi"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Atļaut pasākumu skaņas"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Notikumi"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"No gaidāmajiem kalendāra pasākumiem"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Atļaut lietotnēm ignorēt režīmu “Netraucēt”"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Lietotnes izņēmumi"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Rādīt pāri citām lietotnēm"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Atļaut rādīt pāri citām lietotnēm"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Atļaut rādīt šo lietotni pāri citām jūsu izmantotajām lietotnēm. Šī lietotne var traucēt izmantot citas lietotnes vai mainīt šo lietotņu attēlojumu vai darbību."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Piekļuve visiem failiem"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Atļaut piekļuvi visu failu pārvaldībai"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Atļaujiet šai lietotnei lasīt, pārveidot un dzēst visus failus šajā ierīcē vai pievienotajās atmiņas ierīcēs. Ja piešķirsiet atļauju, lietotne varēs piekļūt failiem, jums par to nezinot."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Var piekļūt visiem failiem"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuālā realitāte klausītājs stereo palīgs pakalpojums"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Rādīt pāri citām lietotnēm"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%2$d</xliff:g> drīkst rādīt pāri citām lietotnēm"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c218afb..cb5f755 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Постави „Моја локација“, отклучување на екран, заклучување на SIM картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Постави „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Приватност"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Оневозможено од администраторот"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Не е достапно"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Безбедносен статус"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заклучување екран, отклучување со лик"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Заклучување екран, отпечаток"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"При користење „Отклучување со лик“ во апликации, секогаш барај потврда"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Избриши под. за лик"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Поставете „Отклучување со лик“"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Користете „Отклучување со лик“ за отклучување на уредот, најавување на апликации и потврдување плаќања.\n\nИмајте предвид:\nТелефонот може да се отклучи кога гледате во него, дури и ако немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик кога очите ви се отворени.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, ваш идентичен близнак."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Користете „Отклучување со лик“ за отклучување на уредот, најавување на апликации и потврдување плаќања.\n\nИмајте предвид:\nТелефонот може да се отклучи кога гледате во него, дури и ако немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, ваш идентичен близнак."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Користете „Отклучување со лик“ за отклучување на уредот, најавување на апликации и потврдување плаќања.\n\nИмајте предвид:\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик, дури и ако очите ви се затворени.\n\nНекој што многу наликува на вас може да го отклучи вашиот телефон, на пример, ваш идентичен близнак."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Да се избришат податоците за ликот?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Податоците за лицето што се користат за „Отклучување со лик“ ќе се избришат трајно и безбедно. По отстранувањето, ќе ви треба PIN, шема или лозинка за да го отклучувате телефонот, да се најавувате на апликациите и да ги потврдувате плаќањата."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Идентитет"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Анонимен идентитет"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Лозинка"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Идентификатор на лозинка за SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Прикажи лозинка"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Изберете појас на АП"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автоматски"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Се споделува Wi‑Fi со уредов…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Се поврзува…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Споделете точка на пристап"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Потврдете дека сте вие"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Потврдете дека сте вие"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Вклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Никогаш нема да се исклучи автоматски"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ќе се исклучи автоматски на изгрејсонце"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Темната тема користи вистинска црна боја за подолго траење на батеријата. Распоредите за темната тема не се вклучуваат додека не се исклучи екранот."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Темната тема користи црна заднина за подолго траење на батеријата на некои екрани. Распоредите за темната тема не се вклучуваат додека не се исклучи екранот."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Исклучување на екранот"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"За отпечаток, поставете PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"За безбедност, поставете шема"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Внесете ја лозинката повторно"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Внесете ја лозинката за работниот профил"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Потврдете ја шемата"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Внес. ја шемата на раб. профил"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Внесете го PIN-кодот повторно"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Внесете го PIN-кодот на работниот профил"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Лозинките не се совпаѓаат"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-овите не се совпаѓаат"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Нацртајте ја шемата повторно"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Читач на екран, првенствено за лица со слепило и слаб вид"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Допрете ставки на екранот за да ги слушнете гласно прочитани"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Поставки за титлови"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Зголемување"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Зголемување"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област на зголемување"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Прикажи контролер за поместување"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Прикажи контролер како џојстик за поместување на областа за зголемување"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Поставки за зголемување"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Зголемете со кратенка и троен допир"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"За зголемување"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Опции"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Зумирање на екранот"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Допрете три пати за да зумирате"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Допрете копче за зумирање"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Изберете SIM-картичка"</string>
     <string name="color_orange" msgid="216547825489739010">"Портокалова"</string>
     <string name="color_purple" msgid="6603701972079904843">"Виолетова"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Розова"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Нема вметнати SIM-картички"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Статус на SIM-картичка"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Статус на SIM (отвор за SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> овозможени</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Исклучување на „Не вознемирувај“"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Исклучоци"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокирајте визуелни нарушувања"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволи визуелни сигнали"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Кога е вклучено „Не вознемирувај“"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Дозволете прекинувања што произведуваат звук"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ограничете ги известувањата"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Без звук од известувањата"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Ќе гледате известувања на екранот"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Исклучи го звукот, но дозволи исклучоци"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Исклучоци"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Распоред"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Прикажи ги сите исклучоци"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Исклучоци кога „Не вознемирувај“ е вклучена"</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_schedule" msgid="2003707171924226212">"Распореди"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Стишени известувања"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Кога е вклучен режимот „Не вознемирувај“, ќе се исклучат звукот и вибрациите, освен за ставките што ќе ги дозволите погоре."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Исклучи го звукот на сите, освен"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Исклучен звук"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Разговори"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Дозволи пораки"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"За да проверите дали дозволените пораки пуштаат звук, видете дали вашиот уред е поставен да ѕвони, вибрира или на тивко."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"За „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“, дојдовните пораки се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Никој"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Не дозволувај повици"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Не дозволувај пораки"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Дозволи аларми"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Аларми"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Од тајмери, аларми, безбедносни системи и други апликации"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"аларми"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Пуштај аудиовизуелни звуци"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Звуци од аудиовизуелни содржини"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Од видеа, игри и други аудиовизуелни содржини"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"аудиовизизуелни содржини"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Дозволи звуци при допир"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Звуци при допир"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Од тастатурата и другите копчиња"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"звуци при допир"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Дозволи потсетници"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Потсетници"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Од задачи и потсетници"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"потсетници"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Дозволи настани"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Настани"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Од претстојните настани во календарот"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволете апликациите да занемаруваат"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Исклучоци на апликацијата"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Приказ врз други апликации"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Дозволи прикажување врз други апликации"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Дозволете ѝ на апликација да се прикажува врз другите апликации што ги користите. Тоа може да го попречи користењето на другите апликации или да го промени начинот на кој се појавуваат или однесуваат."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Пристап до сите датотеки"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Дозволете пристап за управување со датотеки"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Дозволете апликацијава да ги чита, менува и брише сите датотеки на уредов или на поврзаните мемориски уреди. Ако се дозволи, апликацијата може да пристапува до датотеките без ваше изречно знаење."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Може да пристапува до сите датотеки"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуелна реалност слушател стерео помошна услуга"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Приказ врз други апликации"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g> аплик. имаат дозвола за прикажување врз други апликации"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3732569..7db8601 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"സ്വകാര്യത"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"അഡ്‌മിൻ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ലഭ്യമല്ല"</string>
     <string name="security_status_title" msgid="6958004275337618656">"സുരക്ഷാ നില"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"സ്ക്രീൻ ലോക്ക്, മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"സ്‌ക്രീൻ ലോക്കും ഫിംഗർപ്രിന്റും"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ആപ്പുകളിൽ മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുമ്പോൾ എല്ലായ്‌പ്പോഴും സ്ഥിരീകരണ ഘട്ടം ആവശ്യമാണ്"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"മുഖ ഡാറ്റ ഇല്ലാതാക്കൂ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കുക"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെൻ്റുകൾ സ്ഥിരീകരിക്കാനും മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക:\nനിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും ഫോണിൽ നോക്കിയാൽ അത് അൺലോക്ക് ചെയ്യപ്പെടാം.\n\nനിങ്ങളുടെ കണ്ണുകൾ തുറന്നിരിക്കുമ്പോൾ മറ്റാർക്കെങ്കിലും നിങ്ങളുടെ ഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം.\n\nനിങ്ങളുടെ കൂടപ്പിറപ്പിനെ പോലെ, നിങ്ങളുമായി വളരെയധികം സാമ്യതയുള്ള ഒരാൾക്ക് നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാനായേക്കാം."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക.\n\nഓർക്കുക:\n വെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ, നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി ആർക്കും അത് അൺലോക്ക് ചെയ്യാം.\n\nനിങ്ങളുമായി വളരെയധികം സാമ്യതയുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനാവും, ഉദാഹരണത്തിന് നിങ്ങളുമായി സാദൃശ്യമുള്ള സഹോദരങ്ങൾ."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക.\n\nഓർക്കുക:\n വെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ, നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nകണ്ണുകൾ അടച്ചിരിക്കുമ്പോൾ പോലും മറ്റാർക്കെങ്കിലും ഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം.\n\nനിങ്ങളുമായി സാദൃശ്യമുള്ള സഹോദരങ്ങളെ പോലെ, നിങ്ങളുമായി വളരെയധികം സാമ്യതയുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനാവും."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"മുഖ ഡാറ്റ ഇല്ലാതാക്കണോ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്\' ഉപയോഗിക്കുന്ന മുഖ ഡാറ്റ ശാശ്വതമായും സുരക്ഷിതമായും ഇല്ലാതാക്കും. നീക്കം ചെയ്‌തതിനു ശേഷം, ഫോൺ അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും നിങ്ങളുടെ പിൻ, പാറ്റേൺ, അല്ലെങ്കിൽ പാസ്‍വേഡ് ആവശ്യമാണ്."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ഐഡന്റിറ്റി"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"അജ്ഞാത ഐഡന്റിറ്റി"</string>
     <string name="wifi_password" msgid="1458802324849513755">"പാസ്‌വേഡ്"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE പാസ്‌വേഡ് ഐഡന്റിഫയർ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"പാസ്‌വേഡ് കാണിക്കുക"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ബാൻഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"സ്വമേധയാ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ഈ ഉപകരണവുമായി Wi‑Fi പങ്കിടുന്നു…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"കണക്‌റ്റ് ചെയ്യുന്നു…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ഹോട്ട്‌സ്പോട്ട് പങ്കിടുക"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ഇത് നിങ്ങളാണെന്ന് പരിശോധിച്ചുറപ്പിക്കുക"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ഇത് നിങ്ങളാണെന്ന് പരിശോധിച്ചുറപ്പിക്കൂ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ഓണാക്കുക / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ഒരിക്കലും സ്വയമേവ ഓഫാകില്ല"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"സൂര്യോദയ സമയത്ത് സ്വമേധയാ ഓഫാകും"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ബാറ്ററി കൂടുതൽ സമയം നിൽക്കാനായി ഡാർക്ക് തീം, യഥാർത്ഥ കറുപ്പ് നിറം ഉപയോഗിക്കുന്നു. ഷെഡ്യൂൾ ചെയ്തിരിക്കുന്ന ഡാർക്ക് തീം ഓണാകാൻ സ്ക്രീൻ ഓഫാകുന്നത് വരെ കാത്തിരിക്കും."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ചില സ്ക്രീനുകളിൽ ബാറ്ററി കൂടുതൽ നേരം നിലനിൽക്കുന്നതിന് ഡാർക്ക് തീം ഒരു ബ്ലാക്ക് പശ്ചാത്തലം ഉപയോഗിക്കുന്നു. സ്ക്രീൻ ഓഫാകുന്നത് വരെ ഓണാകുന്നതിന് കാത്തിരിക്കാൻ ഡാർക്ക് തീം ഷെഡ്യൂൾ ചെയ്യുന്നു."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"സ്ക്രീൻ ടൈംഔട്ട്"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"സ്ക്രീൻ ഓഫാക്കുന്നു"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> നിഷ്ക്രിയത്വത്തിന് ശേഷം"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാൻ, പിൻ സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"സുരക്ഷയ്‌ക്കായി, പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"നിങ്ങളുടെ ഔദ്യോഗിക പാസ്‌വേഡ് നൽകുക"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ഔദ്യോഗിക പാറ്റേൺ നൽകുക"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"നിങ്ങളുടെ പിൻ വീണ്ടും നൽകുക"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"പിൻ നമ്പറുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"നിങ്ങളുടെ പാറ്റേൺ വീണ്ടും വരയ്ക്കുക"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"പ്രധാനമായും അന്ധർക്കും കാഴ്‍ചശക്തി കുറഞ്ഞവർക്കുമുള്ളതാണ് സ്ക്രീൻ റീഡർ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"നിങ്ങളുടെ സ്ക്രീനിലെ ഇനങ്ങൾ ഉറക്കെ വായിക്കുന്നത് കേൾക്കാൻ അവയിൽ ടാപ്പ് ചെയ്യുക"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"അടിക്കുറിപ്പ് മുൻഗണനകൾ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"മാഗ്നിഫിക്കേഷൻ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"മാഗ്നിഫൈ ചെയ്യുക"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"മാഗ്നിഫിക്കേഷൻ ഏരിയ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"നീക്കൽ കൺട്രോളർ കാണിക്കുക"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"മാഗ്നിഫിക്കേഷൻ ഏരിയ നീക്കാൻ ജോയ്‌സ്‌റ്റിക്ക് പോലെയുള്ള കൺട്രോളർ കാണിക്കുക"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"മാഗ്നിഫിക്കേഷൻ ക്രമീകരണം"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"കുറുക്കുവഴി, മൂന്ന് തവണ ടാപ്പ് എന്നിവയിലൂടെ മാഗ്നിഫൈ ചെയ്യൂ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"മാഗ്നിഫിക്കേഷനെ കുറിച്ച്"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ഓപ്ഷനുകൾ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"സ്ക്രീനിൽ സൂം ഇൻ ചെയ്യുക"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"സൂം ചെയ്യാൻ 3 തവണ ടാപ്പ് ചെയ്യുക"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"സൂം ചെയ്യുന്നതിന് ബട്ടണിൽ ടാപ്പ് ചെയ്യുക"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="color_orange" msgid="216547825489739010">"ഓറഞ്ച്"</string>
     <string name="color_purple" msgid="6603701972079904843">"പര്‍പ്പിള്‍"</string>
+    <string name="color_pink" msgid="8596872110888626708">"പിങ്ക്"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"സിം കാർഡുകളൊന്നും ചേർത്തിട്ടില്ല"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"സിം നില"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"സിം നില (സിം സ്ലോട്ട് %1$d)"</string>
@@ -3246,6 +3253,8 @@
       <item quantity="one">ഒരെണ്ണം പ്രവർത്തനക്ഷമമാക്കി</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ശല്യപ്പെടുത്തരുത്"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"തടസ്സങ്ങൾ പരിമിതപ്പെടുത്തുക"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കുക"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ഒഴിവാക്കലുകൾ"</string>
@@ -3272,7 +3281,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ദൃശ്യതടസങ്ങൾ ബ്ലോക്കുചെയ്യൂ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ദൃശ്യ സിഗ്നലുകൾ അനുവദിക്കുക"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"ശല്ല്യപ്പെടുത്തരുത് എന്നത് ഓണാക്കുമ്പോൾ"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"അറിയിപ്പുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"അറിയിപ്പുകൾക്ക് ശബ്‍ദം വേണ്ട"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"നിങ്ങളുടെ സ്‌ക്രീനിൽ അറിയിപ്പുകൾ കാണും"</string>
@@ -3333,10 +3343,18 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ഷെഡ്യൂളുകൾ സ്വമേധയാ ഓണാക്കാനാവും</item>
       <item quantity="one">ഒരു ഷെഡ്യൂള്‍‌ സ്വമേധയാ ഓണാക്കാനാവും</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"ഉപകരണം മ്യൂട്ട് ചെയ്യുക, എന്നാൽ ഒഴിവാക്കലുകൾ അനുവദിക്കുക"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ഒഴിവാക്കലുകൾ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"ഷെഡ്യൂള്‍‌"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"എല്ലാ ഒഴിവാക്കലുകളും കാണുക"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, ശബ്ദവും വൈബ്രേഷനും മ്യൂട്ട് ചെയ്യപ്പെടും."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ഇനിപ്പറയുന്നത് ഒഴികെയുള്ള എല്ലാം മ്യൂട്ട് ചെയ്യുക"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"മ്യൂട്ട് ചെയ്തു"</string>
@@ -3596,6 +3614,8 @@
       <item quantity="other">മറ്റ് <xliff:g id="NUM_PEOPLE">%d</xliff:g> പേർ</item>
       <item quantity="one">മറ്റൊരാൾ</item>
     </plurals>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"സന്ദേശങ്ങൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"സന്ദേശങ്ങൾ വരുമ്പോൾ ശബ്‌ദം ഉണ്ടാകുന്നുണ്ട് എന്ന് ഉറപ്പാക്കാനായി നിങ്ങളുടെ ഫോൺ റിംഗ്, വൈബ്രേറ്റ് അല്ലെങ്കിൽ നിശബ്‌ദ മോഡ് ഇവയിൽ ഏതിലാണ് സജ്ജീകരിച്ചിരിക്കുന്നതെന്ന് പരിശോധിക്കുക."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ എന്നതിനുള്ള ഇന്‍‌കമിംഗ് സന്ദേശങ്ങൾ ബ്ലോക്ക് ചെയ്‌തിരിക്കുന്നു. സുഹൃത്തുക്കളേയും കുടുംബാംഗങ്ങളേയും മറ്റ് കോണ്‍‌ടാക്‌റ്റുകളേയും നിങ്ങളിലേക്ക് എത്തിച്ചേരാന്‍ അനുവദിക്കുന്നതിന്‌ ക്രമീകരണങ്ങളിൽ മാറ്റം വരുത്താനാവും."</string>
@@ -3609,15 +3629,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ഒന്നുമില്ല"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ഒരു കോളുകളും അനുവദിക്കരുത്"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ഒരു സന്ദേശങ്ങളും അനുവദിക്കരുത്"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"അലാറങ്ങൾ അനുവദിക്കുക"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"അലാറങ്ങൾ"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"അലാറങ്ങൾ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"മീഡിയാ ശബ്‌ദങ്ങൾ പ്ലേ ചെയ്യുക"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"മീഡിയ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"സ്‌പർശന ശബ്‌ദങ്ങൾ അനുവദിക്കുക"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"സ്‌പർശന ശബ്‌ദങ്ങൾ"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"സ്‌പർശന ശബ്‌ദങ്ങൾ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"റിമൈൻഡറുകൾ അനുവദിക്കുക"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"റിമൈൻഡറുകൾ"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"റിമൈൻഡർ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ഇവന്റുകൾ അനുവദിക്കുക"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ഇവന്റുകൾ"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"അസാധുവാക്കാൻ ആപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ആപ്പ് ഒഴിവാക്കലുകൾ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3944,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ പ്രദർശിപ്പിക്കുക"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"മറ്റ് ആപ്‌സിന് മുകളിൽ പ്രദർശിക്കുന്നത് അനുവദിക്കുക"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ ഒരു ആപ്പിനെ ദൃശ്യമാക്കുന്നതിന് ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ആ ആപ്പുകൾ ഉപയോഗിക്കുന്നതിനെ ഇത് തടസ്സപ്പെടുത്തുകയോ അവ കാണപ്പെടുന്ന അല്ലെങ്കിൽ പെരുമാറുന്ന രീതിയെ മാറ്റുകയോ ചെയ്തേക്കാം."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"എല്ലാ ഫയലുകളിലേക്കും ആക്സസ്"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"എല്ലാ ഫയലുകളും മാനേജ് ചെയ്യാൻ ആക്സസ് അനുവദിക്കൂ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ഈ ഉപകരണത്തിലെയോ ഇതുമായി ബന്ധിപ്പിച്ചിട്ടുള്ള ഏതെങ്കിലും സ്‌റ്റോറേജുകളിലെയോ എല്ലാ ഫയലുകളും വായിക്കാനും പരിഷ്ക്കരിക്കാനും ഇല്ലാതാക്കാനും ഈ ആപ്പിനെ അനുവദിക്കുക. അനുമതി നൽകിയിട്ടുണ്ടെങ്കിൽ, നിങ്ങളുടെ അറിവില്ലാതെ തന്നെ ആപ്പ് ഫയലുകൾ ആക്സസ് ചെയ്തേക്കാം."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"എല്ലാ ഫയലുകളും ആക്സസ് ചെയ്യാനാവും"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr വെർച്വൽ റിയാലിറ്റി ലിസണർ സ്റ്റീരിയോ സഹായി സേവനം"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കൂ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"മറ്റ് ആപ്‌സിന് മുകളിൽ പ്രദർശിപ്പിക്കാൻ <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> ആപ്‌സിനെ അനുവദിച്ചു"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e565171..60b6b07 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Нууцлал"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Админ цуцалсан"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Боломжгүй"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Аюулгүй байдлын төлөв"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Дэлгэцийн түгжээ, царайгаар тайлах"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Дэлгэцийн түгжээ, хурууны хээ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Царайгаар тайлах онцлогийг аппуудад ашиглах үед баталгаажуулах алхмыг тогтмол шаардах"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Царайны өгөгдлийг устгах уу?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Царайгаар тайлах онцлогийг тохируулах"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахад царайгаар тайлах онцлогийг ашиглана уу.\n\nДараахыг анхаарна уу:\nТа утас руугаа санамсаргүй харснаар түгжээг тайлах боломжтой.\n\nХэн нэгэн таны утсыг таны нүүр лүү нүдээ нээлттэй байхад тань харуулсан тохиолдолд түгжээг нь тайлах боломжтой.\n\nТаны хүүхэд эсвэл ихэр зэрэг тантай маш адилхан харагддаг хүн таны утасны түгжээг тайлах боломжтой."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахад царайгаар тайлах онцлогийг ашиглана уу.\n\nДараахыг анхаарна уу:\nТа утас руу санамсаргүй харснаар түгжээг нь тайлах боломжтой.\n\nХэн нэгэн таны утсыг таны нүүр лүү харуулсан тохиолдолд түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү эсвэл ихэр зэрэг тантай маш адилхан харагддаг хүн таны утасны түгжээг тайлах боломжтой."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахын тулд царайгаар тайлах онцлогийг ашиглана уу.\n\nДараахыг анхаарна уу:\nТа утас руугаа санаандгүй харснаар түгжээг нь тайлах боломжтой.\n\nХэрэв хэн нэгэн таны утсыг нүүрний тань урд барьвал та нүдээ аньсан байсан ч түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү зэрэг тантай адилхан харагддаг хэн нэгэн таны утасны түгжээг тайлах боломжтой."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Царайны өгөгдлийг устгах уу?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Царайгаар тайлах онцлогийн ашигласан царайны өгөгдлийг аюулгүйгээр, бүрмөсөн устгана. Та үүнийг хассаны дараа утасныхаа түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахын тулд ПИН, хээ эсвэл нууц үгээ оруулах шаардлагатай болно."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Таниулбар"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Нэргүй таниулбар"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Нууц үг"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-н нууц үгийн таниулбар"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Нууц үгийг харуулах"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP Band сонгох"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автомат"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi-г энэ төхөөрөмжтэй хуваалцаж байна…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Холбогдож байна…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Сүлжээний цэгийг хуваалцах"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Өөрийгөө мөн гэдгийг баталгаажуулаарай"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Та мөн болохоо бататгана уу"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Автоматаар хэзээ ч унтрахгүй"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Нар мандахад автоматаар унтарна"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Бараан загвар нь таны батарейн ашиглалтын хугацааг уртасгахад туслахын тулд хар өнгө ашигладаг. Бараан загварын хуваарьт төлөв нь таны дэлгэц унтрах хүртэл хүлээж байгаад асна."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Бараан загвар нь таны батарейн ашиглалтын хугацааг зарим сайт дээр уртасгахад туслахын тулд хар өнгийн дэвсгэр ашигладаг. Бараан загварын хуваарьт төлөв нь таны дэлгэц унтрах хүртэл хүлээж байгаад асна."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Дэлгэцийн завсарлага"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Хурууны хээ ашиглахын тулд ПИН тохируулах"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Аюулгүй байдлын үүднээс хээ тохируулна уу"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Нууц үгээ дахин оруулах"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ажлын нууц үгээ оруулна уу"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Хээгээ баталгаажуулна уу"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ажлын хээгээ оруулна уу"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ПИН-ээ дахин оруулах"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ажлын ПИН-ээ оруулна уу"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Нууц үг таарахгүй байна."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN таарахгүй байна"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Хээгээ дахин зурах"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Дэлгэц уншигчийг ерөнхийдөө сохор буюу харааны гажигтай хүмүүст зориулсан"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Дэлгэц дээрх зүйлсийг чанга уншуулахын тулд дарна уу"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Тайлбарын сонголт"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Томруулах"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Томруулах"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Томруулалтын хэсэг"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Хөдөлгөөн хянагчийг харуулах"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Томруулалтын хэсгийг зөөхийн тулд тоглоомын гар шиг хянагчийг харуулах"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Томруулах тохиргоо"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Товчлол болон гурав товшилтоор томруулах"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Томруулах тухай"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Сонголтууд"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Дэлгэцэд томруулах"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Томруулахын тулд 3 удаа дар"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Томруулахын тулд товчлуурыг товшино уу"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM карт сонгоно уу"</string>
     <string name="color_orange" msgid="216547825489739010">"Улбар шар"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ягаан"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ягаан"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM карт байхгүй байна"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM статус"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-н төлөв (sim-н слот %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1-г идэвхжүүлсэн</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Бүү саад бол горимыг асаах"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Үл хамаарах зүйлс"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Харааны саадыг блоклох"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Харагдаж буй дохиог зөвшөөрөх"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Бүү саад бол горимыг асаалттай үед"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Дуу гаргадаг саад болох зүйлсийг зөвшөөрөх"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Мэдэгдлийг хязгаарлах"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Мэдэгдлийн дууг хаах"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Та мэдэгдлийг дэлгэцдээ харах болно"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>хуваарийг автоматаар асааж болно</item>
       <item quantity="one">1 хуваарийг автоматаар асааж болно</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"Төхөөрөмжийн дууг хаах хэдий ч үл хамаарах зүйлсийг зөвшөөрнө"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Үл хамаарах зүйлс"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Хуваарь"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Бүх үл хэрэгсэх зүйлийг харах"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Бүү саад бол горим асаалттай байх үеийн онцгой тохиолдол"</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_schedule" msgid="2003707171924226212">"Хуваарь"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Дууг нь хаасан мэдэгдлүүд"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Бүү саад бол горим асаалттай үед таны сонгосон зүйлсээс бусад зүйлийн дууг хаана."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Дараахаас бусдын дууг хаах"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Дууг хаасан"</string>
@@ -3594,6 +3604,7 @@
       <item quantity="other">бусад <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">бусад 1</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Харилцан яриа"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Зурвасыг зөвшөөрөх"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Зөвшөөрөгдсөн мессежийг дуугаргахын тулд төхөөрөмжөө дуугаргах, чичиргэх эсвэл чимээгүй байлгахын аль дээр нь тохируулснаа шалгана уу."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх зурвасыг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
@@ -3607,15 +3618,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Байхгүй"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ямар ч дуудлагыг зөвшөөрөхгүй"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Мессежийг зөвшөөрөхгүй"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Сэрүүлгийг зөвшөөрөх"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Сэрүүлэг"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Цаг хэмжигч, сэрүүлэг, хамгаалалтын систем болон бусад аппын"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"сэрүүлэг"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Медианы дууг тоглуулах"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Медианы ая"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Видео, тоглоом болон бусад медианы"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"медиа"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Хүрэлтийн дууг зөвшөөрөх"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Хүрэлтийн ая"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Таны гар болон бусад товчлуурын"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"товшилтын авиа"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Сануулагчийг зөвшөөрөх"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Сануулагч"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Ажил болон сануулагчийн"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"сануулагч"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Арга хэмжээг зөвшөөрөх"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Үйл явдал"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Календарьт удахгүй болох үйл явдлын"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Аппуудад дарахыг нь зөвшөөрөх"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Аппын үл хамаарах зүйлс"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3911,6 +3927,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Бусад апп дээр харуулах"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Бусад апп дээр харуулахыг зөвшөөрөх"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Энэ аппыг ашиглаж буй бусад аппын дээр харуулахыг зөвшөөрнө үү. Ингэснээр таны бусад аппын ашиглалт эсвэл тэдгээрийн харагдац, ажиллагаанд өөрчлөлт орж болзошгүй."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Бүх файлд хандах хандалт"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Бүх файлыг удирдахын тулд хандахыг зөвшөөрөх"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Энэ аппад энэ төхөөрөмж дээрх эсвэл холбогдсон дурын хадгалах сангийн бүх файлыг унших, өөрчлөх болон устгахыг зөвшөөрөх. Зөвшөөрөл олгогдсон бол апп нь танд тодорхойлон мэдэгдэлгүйгээр файлд хандаж болзошгүй."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Бүх файлд хандах боломжтой"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуал бодит сонсогч стерео туслагч үйлчилгээ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Бусад апп дээр харуулах"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> аппын <xliff:g id="COUNT_0">%1$d</xliff:g>-г бусад апп дээр харуулахыг зөвшөөрсөн"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 992fb53..b17d1a9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"गोपनीयता"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"प्रशासकाने अक्षम केलेले"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"उपलब्ध नाही"</string>
     <string name="security_status_title" msgid="6958004275337618656">"सुरक्षितता स्थिती"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रीन लॉक, फेस अनलॉक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फिंगरप्रिंट"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ॲप्समध्ये फेस अनलॉक वापरताना, नेहमी खात्री करणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"फेस डेटा हटवा"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"फेस अनलॉक सेट करा"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा. \n\n लक्षात ठेवा:\nतुमचा हेतू नसताना देखील फोनकडे पाहिल्यास तो अनलॉक होऊ शकतो.\n\nतुमचे डोळे उघडे असताना एखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्याकडे धरल्यास तुमचा फोन अनलॉक केला जाऊ शकतो\n\nतुमच्यासारखी दिसणारी व्यक्ती तुमचा फोन संभाव्यत: अनलॉक करू शकते, जसे की, तुमचे भावंड."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा. \n\n लक्षात ठेवा:\nतुमचा हेतू नसताना देखील फोनकडे पाहिल्यास तो अनलॉक होऊ शकतो.\n\n एखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्याकडे धरल्यास तुमचा फोन अनलॉक केला जाऊ शकतो\n\nतुमच्यासारखी दिसणारी व्यक्ती तुमचा फोन संभाव्यत: अनलॉक करू शकते, जसे की, तुमच्यासारखे दिसणारे भावंड."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा. \n\n लक्षात ठेवा:\nतुम्हाला फोन अनलॉक करायचा नसताना देखील तुम्ही फोनकडे पाहिल्यामुळे तो अनलॉक होऊ शकतो.\n\nतुमचे डोळे बंद असताना देखील दुसऱ्या कोणीतरी तुमचा फोन तुमच्या चेहऱ्यासमोर धरल्यास, तुमचा फोन अनलॉक केला जाऊ शकतो.\n\nअगदी तुमच्यासारख्या दिसणाऱ्या व्यक्तीकडून उदा. जुळ्या भावंडाकडून तुमचा फोन अनलॉक केला जाऊ शकतो."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"फेस डेटा हटवायचा?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"फेस अनलॉकद्वारे वापरला जाणारा फेस डेटा कायमचा आणि सुरक्षितपणे हटवला जाईल. काढून टाकल्यानंतर, तुमचा फोन अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंट निश्चित करण्यासाठी तुम्हाला तुमचा पिन, पॅटर्न किंवा पासवर्ड लागेल."</string>
@@ -766,8 +766,7 @@
     <string name="wifi_tap_to_sign_in" msgid="8658506618807549483">"नेटवर्कवर साइन इन करण्यासाठी येथे टॅप करा"</string>
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
-    <!-- no translation found for link_speed (931786745741016446) -->
-    <skip />
+    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय चालू करू इच्छित आहे"</string>
     <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय बंद करू इच्छित आहे"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"डीबग करण्यायोग्य ॲप्सच्या बाइटकोडची पडताळणी करा"</string>
@@ -775,10 +774,8 @@
     <string name="show_refresh_rate" msgid="5742688821872354973">"रीफ्रेश रेट दाखवा"</string>
     <string name="show_refresh_rate_summary" msgid="3558118122374609663">"सध्याचा प्रदर्शन रीफ्रेश रेट दाखवा"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
-    <!-- no translation found for nfc_quick_toggle_summary (3622326550467939809) -->
-    <skip />
-    <!-- no translation found for nfc_quick_toggle_summary (1460871052409162980) -->
-    <skip />
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"टॅबलेट NFC डिव्हाइसला स्पर्श करते तेव्हा डेटा एक्‍सचेंजला अनुमती द्या"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"फोन NFC डिव्हाइसला स्पर्श करतो तेव्हा डेटा एक्‍सचेंजला अनुमती द्या"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"NFC चालू करा"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, अ‍ॅक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
     <string name="nfc_secure_settings_title" msgid="8947380729696717356">"NFC चे संरक्षण करा"</string>
@@ -880,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ओळख"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"अनामित ओळख"</string>
     <string name="wifi_password" msgid="1458802324849513755">"पासवर्ड"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE पासवर्ड आयडेंटिफायर"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"पासवर्ड दाखवा"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP बँड निवडा"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"आपोआप"</string>
@@ -921,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"या डिव्हाइससह वाय‑फाय शेअर करत आहे…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"कनेक्ट करत आहे…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"हॉटस्पॉट शेअर करा"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ते तुम्हीच आहात याची पडताळणी करा"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"हे तुम्ही असल्याची खात्री करा"</string>
     <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" 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>
@@ -1229,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"सुरू आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"आपोआप कधीही बंद होणार नाही"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सूर्योदयाच्या वेळी आपोआप बंद होईल"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"तुमची बॅटरी अधिक काळ टिकून राहावी यासाठी गडद थीम ही गडद काळा रंग वापरते. तुमची स्क्रीन बंद हाेईपर्यंत गडद थीम सुरू हाेत नाही."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"काही स्क्रीनवर बॅटरी अधिक काळ टिकवून ठेवण्यासाठी गडद थीम काळ्या बॅकग्राउंडचा वापर करते. तुमची स्क्रीन बंद होईपर्यंत गडद थीमची शेड्युल सुरू होत नाहीत."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रीन टाइमआउट"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"स्क्रीन बंद होते"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"निष्क्रियतेच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -1718,8 +1716,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"फिंगरप्रिंट वापरण्यासाठी पिन सेट करा"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"सुरक्षिततेसाठी, पॅटर्न सेट करा"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"तुमचा पासवर्ड पुन्‍हा टाका"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"तुमच्या ऑफिसचा पासवर्ड एंटर करा"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"आपल्या नमुन्याची पुष्टी करा"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"तुमच्या ऑफिसचा पॅटर्न एंटर करा"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"तुमचा पिन पुन्हा टाका"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"तुमच्या ऑफिसचा पिन एंटर करा"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"पासवर्ड जुळत नाहीत"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"पिन जुळत नाहीत"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"तुमचा पॅटर्न पुन्हा काढा"</string>
@@ -2055,20 +2056,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"स्क्रीन रीडर प्रामुख्याने दृष्टीहीन किंवा कमी दृष्टी असलेल्या लोकांसाठी आहे"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"आयटमना मोठ्याने ऐकण्यासाठी स्क्रीनवरील आयटमवर टॅप करा"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कॅप्शन प्राधान्ये"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"मोठे करणे"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"मॅग्निफाय करा"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"मॅग्निफाय करायचा असलेला भाग"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"हलवायचा नियंत्रक दाखवा"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"मॅग्निफाय करायचा असलेला भाग हलवण्यासाठी जॉयस्टिकसारखा नियंत्रक दाखवा"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"सेटिंग्ज मॅग्निफाय करा"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"शॉर्टकट वापरून आणि तीन वेळा टॅप करून मॅग्निफाय करा"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"मॅग्निफाय बद्दल"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"पर्याय"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"स्क्रीनवर झूम इन करा"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"झूम करण्यासाठी 3 वेळा टॅप करा"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"झूम करण्यासाठी बटणावर टॅप करा"</string>
@@ -3088,6 +3091,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"सिम कार्ड निवडा"</string>
     <string name="color_orange" msgid="216547825489739010">"नारिंगी"</string>
     <string name="color_purple" msgid="6603701972079904843">"जांभळा"</string>
+    <string name="color_pink" msgid="8596872110888626708">"गुलाबी"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"कोणतीही सिम कार्डे घातलेली नाहीत"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"सिम स्थिती"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"सिम स्थिती (सिम स्लॉट %1$d)"</string>
@@ -3128,8 +3132,7 @@
     <string name="search_results_title" msgid="3360639917793022533">"सेटिंग्ज"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"वायफाय, वाय-फाय, नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाय फाय"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"वाय-फाय सूचना, वायफाय सूचना"</string>
-    <!-- no translation found for keywords_wifi_data_usage (4718555409695862085) -->
-    <skip />
+    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"डेटा वापर"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"व्हायब्रेशन थांबवा, टॅप करा, कीबोर्ड"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"२४-तास फॉरमॅट वापरा"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"डाउनलोड करा"</string>
@@ -3251,6 +3254,7 @@
       <item quantity="one">एक सुरू केले</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"व्यत्यय आणू नका चालू करा"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"अपवाद"</string>
@@ -3277,7 +3281,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"दृश्य व्यत्यय ब्लॉक करा"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"व्हिज्युअल सिग्नलना अनुमती द्या"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"व्यत्यय आणू नका सुरू असते तेव्हा"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"आवाज करतात त्या सर्व व्यत्ययांना अनुमती द्या"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"सूचना प्रतिबंधित करा"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"सूचना आल्यावर आवाज नाही"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"तुम्हाला तुमच्या स्क्रीनवर सूचना दिसतील"</string>
@@ -3338,10 +3342,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्युल आपोआप सुरू केले जाऊ शकतात</item>
       <item quantity="one">एक शेड्युल आपोआप सुरू केले जाऊ शकते</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"डिव्हाइस म्यूट करा पण अपवादांना अनुमती द्या"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"अपवाद"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"शेड्युल"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"सर्व अपवाद पाहा"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"व्यत्यय आणू नका सुरू असते तेव्हा एक्सेप्शन"</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_schedule" msgid="2003707171924226212">"शेड्युल"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"सायलंट केलेल्या सूचना"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"जेव्हा व्यत्यय आणू नका सुरू असते, तेव्हा फोनचा आवाज आणि व्हायब्रेशन म्यूट होतात, वरील आयटमसाठी दिलेल्या अनुमती व्यतिरिक्त"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"व्यतिरिक्त सर्व म्यूट करा"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"म्यूट केले आहे"</string>
@@ -3601,6 +3607,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> अन्य</item>
       <item quantity="one">एक अन्य</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"संभाषणे"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"मेसेजची अनुमती द्या"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"अनुमती असलेले मेसेज आल्यावर आवाज होईल याची खात्री करण्यासाठी तुमचे डिव्हाइस रिंग होण्यासाठी, कंपन किंवा सायलंटवर सेट केले आहे की नाही ते पाहा."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ साठी येणारे मेसेज ब्लॉक केले आहेत. तुमच्या मित्रमैत्रिणींना, कुटुंबीयांना किंवा इतर संपर्कांना तुमच्याशी संपर्क साधण्याची अनुमती देण्यासाठी तुम्ही सेटिंग्ज अ‍ॅडजस्ट करू शकता."</string>
@@ -3614,15 +3621,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"काहीही नाही"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"कॉलची अनुमती देऊ नका"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"कोणत्याही मेसेजना अनुमती देऊ नका"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"अलार्मना अनुमती द्या"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्म"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"टायमर, अलार्म, सुरक्षा सिस्टम आणि इतर ॲप्स मधील"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"अलार्म"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"मीडिया आवाज प्ले करा"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"मीडियाचा आवाज"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"व्हिडिओ, गेम आणि इतर मीडिया मधून"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"मीडिया"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"स्पर्श ध्वनींना अनुमती द्या"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"स्पर्श ध्वनी"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"तुमच्या कीबोर्ड आणि इतर बटणांमधील"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"स्पर्श ध्वनी"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"रिमाइंडरना अनुमती द्या"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"स्मरणपत्रे"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"कार्य आणि रिमाइंडर मधील"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"रिमाइंडर्स"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"इव्हेंटना अनुमती द्या"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"इव्हेंट"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"आगामी कॅलेंडर इव्हेंट मधून"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ॲप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"अ‍ॅप अपवाद"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3918,6 +3930,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"इतर अ‍ॅप्सच्या वर प्रदर्शित करू द्या"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या शीर्षस्थानी हे अ‍ॅप डिस्प्ले करण्याची अनुमती द्या. हे तुमच्या त्या अ‍ॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तनात बदल करू शकते."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"सर्व फाइलचा अ‍ॅक्सेस"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"सर्व फाइल व्यवस्थापनासाठी अ‍ॅक्सेस द्या"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"या ॲपला या डिव्हाइसवरील किंवा कनेक्ट केलेल्या स्टोरेज व्‍हॉल्‍यूममधील सर्व फाइल वाचण्याची, सुधारित करण्याची आणि हटवण्याची अनुमती द्या. अनुमती दिली असल्यास, ॲप कदाचित तुम्हाला न विचारता फाइलचा अ‍ॅक्सेस करू शकते"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"सर्व फाइल अ‍ॅक्सेस करू शकते"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr आभासी वास्तविकता श्रोता स्टीरीओ मदतकर्ता सेवा"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अ‍ॅप्सना इतर अ‍ॅप्सच्या वर प्रदर्शित होण्याची अनुमती"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8c333d7..5c1ddc2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privasi"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Dilumpuhkan oleh pentadbir"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Tidak tersedia"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status keselamatan"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci skrin, wajah buka kunci"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci skrin, cap jari"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Apabla menggunakan wjh buka knci dlm apl, sentiasa perlukan pengesahan"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Padamkan data wajah"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Sediakan wajah buka kunci"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran.\n\nJangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu apabila anda tidak bermaksud untuk melakukan perkara ini.\n\nTelefon anda boleh dibuka kuncinya oleh seseorang jika telefon itu dihalakan rapat ke wajah anda semasa mata anda terbuka.\n\nTelefon anda boleh dibuka kuncinya oleh seseorang yang kelihatan mirip anda, seperti adik beradik yang berwajah iras anda."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran.\n\nJangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu apabila anda tidak bermaksud untuk berbuat demikian.\n\nTelefon anda boleh dibuka kuncinya oleh orang lain jika telefon itu dihalakan rapat ke wajah anda.\n\nTelefon anda boleh dibuka kuncinya oleh seseorang yang mirip anda, seperti adik beradik yang berwajah seiras anda."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran.\n\nJangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu walaupun anda tidak bermaksud untuk berbuat demikian.\n\nTelefon anda boleh dibuka kunci oleh orang lain jika telefon itu dihalakan rapat ke wajah anda meskipun mata anda tertutup.\n\nTelefon anda boleh dibuka kunci oleh seseorang yang mirip anda, seperti adik beradik yang berwajah seiras anda."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Padamkan data wajah?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data wajah yang digunakan oleh wajah buka kunci akan dipadamkan secara kekal dan selamat. Selepas pengalihan keluar, anda memerlukan PIN, corak atau kata laluan untuk membuka kunci telefon, log masuk ke apl dan mengesahkan pembayaran."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiti"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identiti tanpa nama"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Kata laluan"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Pengecam kata laluan SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Tunjukkan kata laluan"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Pilih Jalur AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatik"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Berkongsi Wi‑Fi dengan peranti ini…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Menyambung…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Kongsi tempat liputan"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Sahkan diri anda"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Sahkan diri anda"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Tidak akan dimatikan secara automatik"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Akan dimatikan secara automatik pada waktu matahari terbit"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tema gelap menggunakan hitam sebenar untuk memastikan bateri anda tahan lebih lama. Jadual tema gelap menunggu untuk dihidupkan hingga skrin anda dimatikan."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tema hitam menggunakan latar belakang hitam untuk memastikan bateri tahan lebih lama pada sesetengah skrin. Jadual tema gelap menunggu untuk dihidupkan hingga skrin anda dimatikan."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tamat masa skrin"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Buat PIN untuk guna kata laluan"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Untuk keselamatan, tetapkan corak"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Masukkan semula kata laluan anda"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Masukkan kata laluan kerja anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Sahkan corak anda"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Masukkan corak kerja anda"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Masukkan semula PIN anda"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Masukkan PIN kerja anda"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Kata laluan tidak sepadan"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN tidak sepadan"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Lukis corak anda sekali lagi"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Pembaca skrin terutamanya untuk orang yang buta dan rabun"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Ketik item pada skrn anda untuk mendengar item itu dibaca"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Pilihan kapsyen"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Besarkan"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kawasan pembesaran"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Tunjukkan pergerakan pengawal"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Tunjukkan pengawal seperti kayu bedik untuk menggerakkan kawasan pembesaran"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Tetapan pembesaran"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Besarkan menggunakan pintasan &amp; tiga ketikan"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Perihal Besarkan"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Pilihan"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zum masuk pada skrin"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Ketik 3 kali untuk mengezum"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ketik butang untuk mengezum"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Pilih kad SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Oren"</string>
     <string name="color_purple" msgid="6603701972079904843">"Ungu"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Merah Jambu"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Tiada kad SIM dimasukkan"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status SIM (slot sim %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 didayakan</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Hidupkan Jangan Ganggu"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Pengecualian"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Sekat gangguan visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Benarkan isyarat visual"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Apabila Jangan Ganggu dihidupkan"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Benarkan gangguan yang berbunyi"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Hadkan pemberitahuan"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Tiada bunyi daripada pemberitahuan"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Anda akan melihat pemberitahuan pada skrin"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Redamkan peranti tetapi benarkan pengecualian"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Pengecualian"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Jadual"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Lihat semua pengecualian"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Pengecualian apabila Jangan Ganggu dihidupkan"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apl"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Penggera &amp; gangguan lain"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Jadual"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Pemberitahuan yang disenyapkan"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Apabila Jangan Ganggu dihidupkan, bunyi dan getaran akan diredamkan, kecuali item yang anda benarkan di atas."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Redamkan semua kecuali"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Diredamkan"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Perbualan"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Benarkan mesej"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Untuk memastikan mesej yang dibenarkan dapat berbunyi, periksa sama ada peranti anda ditetapkan kepada berdering, bergetar atau senyap."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Tiada"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Jangan benarkan sebarang panggilan"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Jangan benarkan sebarang mesej"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Benarkan penggera"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Penggera"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Daripada pemasa, penggera, sistem keselamatan dan apl lain"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"penggera"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Mainkan bunyi media"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Bunyi media"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Daripada video, permainan dan media lain"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Benarkan bunyi sentuhan"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Bunyi sentuhan"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Daripada papan kekunci dan butang lain"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"bunyi sentuhan"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Benarkan peringatan"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Peringatan"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Daripada tugasan dan peringatan"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"peringatan"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Benarkan acara"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Acara"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Daripada acara kalendar akan datang"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Benarkan apl membatalkan Jangan Ganggu"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Pengecualian apl"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Paparkan di atas apl lain"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Benarkan pemaparan di atas apl lain"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Benarkan apl ini dipaparkan di atas apl lain yang sedang digunakan. Hal ini mungkin mengganggu penggunaan apl itu atau mengubah penampilan atau gelagat apl tersebut."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Akses semua fail"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Benarkan akses untuk mengurus semua fail"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Benarkan apl ini membaca, mengubah suai dan memadamkan semula fail pada peranti ini atau mana-mana unit storan yang disambungkan. Jika dibenarkan, apl mungkin mengakses fail tanpa pengetahuan anda secara jelas."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Boleh mengakses semua fail"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"perkhidmatan pembantu stereo pendengar realiti maya vr"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Paparkan di atas apl lain"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> daripada <xliff:g id="COUNT_1">%2$d</xliff:g> apl dibenarkan untuk dipaparkan di atas apl lain"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 0eee35f..37d4180 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ကန့်သတ်ရန် ဆက်တင်"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"မရနိုင်ပါ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"လုံခြုံရေး အခြေအနေ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ဖုန်းမျက်နှာပြင် လော့ခ်၊ မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ဖန်သားပြင် လော့ခ်ချခြင်း၊ လက်ဗွေ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"အက်ပ်တွင် မျက်နှာမှတ် သော့ဖွင့်ခြင်းသုံးလျှင် အတည်ပြုရန်အမြဲလိုအပ်သည်"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"မျက်နှာဒေတာဖျက်ရန်"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"မျက်နှာမှတ်သော့ဖွင့်ခြင်း ထည့်သွင်းရန်"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် \'မျက်နှာမှတ် သော့ဖွင့်ခြင်း\' ကို အသုံးပြုပါ။\n\nသတိပြုရန်-\nမရည်ရွယ်သော်လည်း သင့်ဖုန်းကို ကြည့်ခြင်းဖြင့် ဖုန်းပွင့်သွားနိုင်သည်။\n\nသင့်မျက်လုံးများကို ဖွင့်ထားချိန် တစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီး သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်ကလေး သို့မဟုတ် အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို အသုံးပြုပါ။\n\nသတိပြုရန်-\nမတော်တဆ သင့်ဖုန်းကို ကြည့်မိရုံမျှဖြင့် ဖုန်းပွင့်သွားနိုင်ပါသည်။\n\nတစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီး သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် \'မျက်နှာမှတ် သော့ဖွင့်ခြင်း\' ကို အသုံးပြုပါ။\n\nသတိပြုရန်-\nသင့်ဖုန်းကို မတော်တဆကြည့်မိရုံဖြင့် ဖုန်းပွင့်သွားနိုင်သည်။\n\nမျက်လုံးများပိတ်ထားသော်လည်း တစ်စုံတစ်ယောက်က သင်၏မျက်နှာအနီးတွင် သင့်ဖုန်းကို ကိုင်ထားခြင်းဖြင့် လော့ခ်ဖွင့်နိုင်သည်။\n\nတထေရာတည်းတူသော မောင်နှမကဲ့သို့ သင်နှင့်အလွန်တူသူ တစ်ယောက်ယောက်က သင်၏ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"မျက်နှာဒေတာ ဖျက်လိုသလား။"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းက အသုံးပြုသည့် မျက်နှာဒေတာများကို လုံခြုံစွာ အပြီးအပိုင်ဖျက်လိုက်ပါမည်။ ဖျက်ပြီးသည့်အခါ သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန် ပင်နံပါတ်၊ ပုံစံ သို့မဟုတ် စကားဝှက်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းနှင့် ငွေပေးချေမှုများ အတည်ပြုခြင်းတို့ လိုအပ်ပါမည်။"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"တစ်ဦးတစ်ယောက်"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"အမည်မသိသူ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"စကားဝှက်"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE စကားဝှက် သတ်မှတ်မှုစနစ်"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"စကားဝှက်ကို ပြသရန်"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP လှိုင်း ရွေးရန်"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"အလိုအလျောက်"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi ကို ဤစက်အား မျှဝေနေသည်…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"ချိတ်ဆက်နေသည်…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ဟော့စပေါ့ မျှဝေရန်"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"သင်ဖြစ်ကြောင်း အတည်ပြုပါ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"သင်ဖြစ်ကြောင်း အတည်ပြုပါ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ဖွင့်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"မည်သည့်အခါမျှ အလိုအလျောက် ပိတ်မည် မဟုတ်ပါ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"နေထွက်ချိန်တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"သင့်ဘက်ထရီသက်တမ်း ပိုမိုကြာရှည်စွာ ခံနိုင်ရန် မှောင်သည့်အပြင်အဆင်သည် လုံးဝအမည်းရောင်ကို အသုံးပြုသည်။ သင့်ဖန်သားပြင်ပိတ်သည်အထိ စောင့်ပြီးမှ မှောင်သည့် အပြင်အဆင် စတင်သည်။"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"အချို့ဖန်သားပြင်များတွင် ဘက်ထရီသက်တမ်း ပိုခံနိုင်ရန် မှောင်သည့် အပြင်အဆင်က အနက်ရောင်နောက်ခံကို အသုံးပြုသည်။ သင့်ဖန်သားပြင်ပိတ်သည်အထိ စောင့်ပြီးမှ မှောင်သည့် အပြင်အဆင် စတင်သည်။"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ဖန်သားပြင် ခဏရပ်ချိန်"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"မျက်နှာပြင်ကို ပိတ်ထားသည်"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>ကြာ အသုံးပြုမှု မရှိလျှင်"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"လက်ဗွေသုံးရန် ပင်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"လုံခြုံရေးအတွက် ပုံစံ သတ်မှတ်ပါ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"သင့်စကားဝှက်ကို ပြန်ထည့်ပါ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"သင်၏ အလုပ်စကားဝှက်ကို ထည့်ပါ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"သင်၏ အလုပ်ပုံစံကို ထည့်ပါ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"သင့်ပင်နံပါတ်ကို ပြန်ထည့်ပါ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"သင်၏ အလုပ်ပင်နံပါတ်ကို ထည့်ပါ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"စကားဝှက်များ မတူပါ။"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ပင်နံပါတ် မတူပါ။"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"သင်၏ ပုံစံကို ထပ်ဆွဲပါ"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"မျက်နှာပြင်ဖတ်စနစ်သည် မျက်မမြင်နှင့် မျက်စိမှုန်သူများအတွက် အဓိကဖြစ်ပါသည်"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"သင့်မျက်နှာပြင်ပေါ်ရှိ အရာများကို အသံထွက်ဖတ်စေရန်အတွက် ၎င်းတို့ကို တို့ပါ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"စာတန်း သတ်မှတ်ချက်များ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ချဲ့ခြင်း"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ချဲ့ရန်"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ပုံကြီးချဲ့ရန် နေရာ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ထိန်းချုပ်ကိရိယာ ရွှေ့ခြင်းကိုပြရန်"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ပုံကြီးချဲ့ရန်နေရာကို ရွှေ့ရန် ထိန်းချုပ်လီဗာနှင့်တူသော ထိန်းချုပ်ကိရိယာကို ပြသည်"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ပုံကြီးချဲ့ ဆက်တင်များ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ဖြတ်လမ်းလင့်ခ်ဖြင့် သုံးချက်တို့ပြီး ချဲ့ပါ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"မှန်ဘီလူးအကြောင်း"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ရွေးစရာများ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"မျက်နှာပြင် ဇူးမ်ဆွဲပါ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ဇူးမ်အသုံးပြုရန် ၃ ကြိမ်တို့ပါ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ဇူးမ်အသုံးပြုရန် ခလုတ်ကို တို့ပါ"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="color_orange" msgid="216547825489739010">"လိမ္မော်"</string>
     <string name="color_purple" msgid="6603701972079904843">"ခရမ်း"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ပန်းရောင်"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ဆင်းမ် ကဒ်များ မထည့်သွင်းရသေး"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ဆင်းမ် အခြေအနေ"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ဆင်းမ် အခြေအနေ (ဆင်းမ် အထိုင် %1$d)"</string>
@@ -3246,6 +3253,8 @@
       <item quantity="one">၁ ခု ဖွင့်ထားသည်</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"မနှောင့်ယှက်ရ"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"အနှောင့်အယှက်များကို တားဆီးသည်"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'မနှောင့်ယှက်ရ\' ဖွင့်ခြင်း"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ခြွင်းချက်များ"</string>
@@ -3272,7 +3281,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"မြင်ကွင်းပိတ်ခြင်းမှတားဆီးပါ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ပြသမှုများကို ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားလျှင်"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"အကြောင်းကြားချက်များ ကန့်သတ်ခြင်း"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"အကြောင်းကြားချက်များအတွက် အသံ မဖွင့်ရန်"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"အကြောင်းကြားချက်များကို သင်၏ မျက်နှာပြင်ပေါ်တွင် မြင်ရပါမည်"</string>
@@ -3333,10 +3343,18 @@
       <item quantity="other">အချိန်ဇယား <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
       <item quantity="one">အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"စက်ပစ္စည်းကို အသံတိတ်ထားသော်လည်း ခြွင်းချက်များကိုမူ ခွင့်ပြုရန်"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ခြွင်းချက်များ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"အချိန်ဇယား"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ခြွင်းချက်အားလုံး ကြည့်ပါ"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ သင်အထက်တွင် ခွင့်ပြုထားသည်များအတွက်မှလွဲ၍ အသံနှင့် တုန်ခါမှုကို ပိတ်ထားပါမည်။"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"အောက်ပါမှလွဲ၍ အားလုံး ပိတ်ထားပါ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ပိတ်ထားသည်"</string>
@@ -3596,6 +3614,8 @@
       <item quantity="other">အခြား <xliff:g id="NUM_PEOPLE">%d</xliff:g> ယောက်</item>
       <item quantity="one">အခြား ၁ ယောက်</item>
     </plurals>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"မက်ဆေ့ဂျ်များကို ခွင့်ပြုရန်"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ခွင့်ပြုထားသော မက်ဆေ့ဂျ်များ အသံထွက်စေရန်အတွက် သင့်ကိရိယာကို အသံမြည်ရန်၊ တုန်ခါရန်သို့မဟုတ် အသံတိတ်ရန် သတ်မှတ်ထားခြင်း ရှိမရှိ စစ်ဆေးပါ။"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ အတွက် အဝင်မက်ဆေ့ဂျ်များကို ပိတ်ထားသည်။ သင့်မိတ်ဆွေ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အား ဆက်သွယ်နိုင်ရန် ဆက်တင်များကို ချိန်ညှိနိုင်သည်။"</string>
@@ -3609,15 +3629,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"မရှိ"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ခေါ်ဆိုမှုများကို ခွင့်မပြုရန်"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"မည်သည့်မက်ဆေ့ဂျ်ကိုမျှ ခွင့်မပြုရန်"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"နှိုးစက်များ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"နှိုးစက်များ"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"နှိုးစက်များ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"မီဒီယာအသံများ ဖွင့်ရန်"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"မီဒီယာ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"စခရင်ထိသံများ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"စခရင်ထိသံ"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"စခရင်ထိသံ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"သတိပေးချက်များကို ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"သတိပေးချက်များ"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"သတိပေးချက်များ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"အစီအစဉ်များ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"အစီအစဉ်များ"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"အက်ပ်များကို အစားထိုးခွင့်ပြုပါ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"အက်ပ်ခြွင်းချက်များ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3703,7 +3734,7 @@
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ထောက်ပံ့ထားသည့် လင့်များကို ဖွင့်မည်"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"မမ​ေးမြန်းဘဲ ဖွင့်မည်"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ထောက်ပံ့ထားသည့်လင့်ခ်များ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ပံ့ပိုးထားသည့်လင့်ခ်များ"</string>
     <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"အခြား မူရင်းများ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ထဲတွင် <xliff:g id="SIZE">%1$s</xliff:g>သုံးထားသည်"</string>
     <string name="storage_type_internal" msgid="8072987826282477558">"စက်တွင်း သိုလှောင်ထားမှု"</string>
@@ -3913,6 +3944,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"အခြားအက်ပ်များအပေါ်တွင် ပြသခွင့် ပြုခြင်း"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"အခြားအက်ပ်များ အပေါ်မှ ပြသခွင့်ပြုရန်"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ဤအက်ပ်အား သင်သုံးနေသော အခြားအက်ပ်များအပေါ်တွင် ပြသခွင့်ပြုပါ။ ၎င်းသည် ထိုအက်ပ်များအသုံးပြုရာ၌ အနှောင့်အယှက်ဖြစ်စေနိုင်ပါသည် သို့မဟုတ် ၎င်းတို့၏ အသွင်အပြင် သို့မဟုတ် အပြုအမူတို့ကို ပြောင်းလဲစေနိုင်ပါသည်။"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ဖိုင်အားလုံး သုံးခွင့်"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ဖိုင်အားလုံးကို စီမံရန် အသုံးပြုခွင့်ပေးပါ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ဤစက်ပစ္စည်း (သို့) ချိတ်ဆက်ထားသော သိုလှောင်နေရာရှိ ဖိုင်များအားလုံးကို ဖတ်ရန်၊ ပြင်ဆင်ရန်နှင့် ဖျက်ရန် ဤအက်ပ်ကို ခွင့်ပြုပါ။ ခွင့်ပြုပြီးပါက အက်ပ်သည် သင့်အား အသိမပေးဘဲ ဖိုင်များကို အသုံးပြုနိုင်ပါမည်။"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ဖိုင်အားလုံးကို အသုံးပြုနိုင်သည်"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr ပကတိအသွင် နားထောင်မှုစနစ် စတီရီယိုအထောက်အကူပြု ဝန်ဆောင်မှု"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"အခြားအက်ပ်များပေါ်မှ ပြသခြင်း"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"အက်ပ် <xliff:g id="COUNT_1">%2$d</xliff:g> ခုအနက်မှ <xliff:g id="COUNT_0">%1$d</xliff:g> ခုသည် အခြားအက်ပ်များပေါ်တွင် ပြသခွင့်ပြုသည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6780251..99644fe 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Personvern"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Avslått av administratoren"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ikke tilgjengelig"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sikkerhetsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjermlås, ansiktslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjermlås, fingeravtrykk"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Krev alltid bekreftelsestrinnet når Ansiktslås brukes i apper"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Slett ansiktsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurer ansiktslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Bruk Ansiktslås til å låse opp enheten din, logge på apper og bekrefte betalinger.\n\nHusk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt mens øynene dine er åpne.\n\nTelefonen kan låses opp av noen som ser veldig ut som deg, for eksempel en tvilling."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Bruk ansiktslås til å låse opp enheten din, logge på apper og bekrefte betalinger.\n\nHusk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt.\n\nTelefonen kan låses opp av noen som ser veldig ut som deg, for eksempel en tvilling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Bruk ansiktslås til å låse opp enheten din, logge på apper og bekrefte betalinger.\n\nHusk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt, selv om øynene dine er lukket.\n\nTelefonen kan låses opp av noen som ser veldig ut som deg, for eksempel en tvilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vil du slette ansiktsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ansiktsdataene som brukes av ansiktslåsen, blir permanent slettet på en sikker måte. Etter fjerning trenger du PIN-kode, mønster eller passord for å låse opp telefonen, logge på apper og bekrefte betalinger."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonym identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Passord"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikator for SAE-passord"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Vis passord"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Velg AP-bånd"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatisk"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deler Wi-Fi med denne enheten …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Kobler til …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Del Wi-Fi-sone"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Bekreft at det er deg"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Bekreft at det er deg"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Blir aldri slått av automatisk"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Blir slått av automatisk ved soloppgang"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Mørkt tema bruker ekte svartnivå for å få batteriet til å vare lenger. Tidsplaner for mørkt tema blir ikke slått på før skjermen din er slått av."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Mørkt tema bruker en svart bakgrunn for å få batteriet til å vare lenger på noen skjermer. Tidsplaner for mørkt tema blir ikke slått på før skjermen din er slått av."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skjermsparer"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Angi PIN for å bruke fingeravtrykk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Angi et sikkerhetsmønster"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Angi passordet på nytt"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Skriv inn jobbpassordet ditt"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekreft mønsteret"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Skriv inn jobbmønsteret ditt"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Angi PIN-koden på nytt"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Skriv inn jobb-PIN-koden din"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passordene samsvarer ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-kodene samsvarer ikke"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Tegn mønsteret ditt på nytt"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Skjermleseren er hovedsakelig for blinde og svaksynte"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Trykk på elementer på skjermen din for å få dem opplest"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Innstillinger for teksting"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Forstørring"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Forstørr"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Vis bevegelseskontroller"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Vis en kontroller som ligner på en styrespak, for å bevege forstørrelsesområdet"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Innstillinger for forstørrelse"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Forstørr med snarvei og trippeltrykk"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Om Forstørr"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Alternativer"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom inn på skjermen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Trykk tre ganger for å zoome"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Trykk på en knapp for å zoome"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Velg SIM-kort"</string>
     <string name="color_orange" msgid="216547825489739010">"Oransje"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lilla"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Det er ikke satt inn noe SIM-kort"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM-status"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-kortstatus (SIM-kortspor %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 er slått på</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Slå på Ikke forstyrr"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Unntak"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkér visuelle forstyrrelser"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillat visuelle signaler"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Når «Ikke forstyrr» er på"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillat forstyrrelser som lager lyd"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Begrens varsler"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ingen lyd fra varsler"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Du ser varsler på skjermen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Kutt enhetslyden, men tillat unntak"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Unntak"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Planlegg"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Se alle unntak"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Unntak når «Ikke forstyrr» er på"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apper"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmer og andre forstyrrelser"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Tidsplaner"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Dempede varsler"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Når «Ikke forstyrr» er på, slås lyd og vibrering av, unntatt for elementene du tillater ovenfor."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Ignorer alle unntatt"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Ignorert"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
       <item quantity="one">1 annen</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Samtaler"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Tillat meldinger"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"For å kontrollere at tillatte meldinger lager lyd, sjekk om enheten din er satt til ringing, vibrering eller lydløs."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ingen"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ikke tillat anrop"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ikke tillat meldinger"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Tillat alarmer"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmer"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Fra nedtellinger, alarmer, sikkerhetssystemer og andre apper"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmer"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Spill av lyd for medier"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Lyd fra medier"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Fra videoer, spill og andre medier"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"medier"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Tillat berøringslyder"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Berøringslyder"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Fra tastaturet ditt og andre knapper"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"berøringslyder"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Tillat påminnelser"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Påminnelser"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Fra oppgaver og påminnelser"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"påminnelser"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Tillat aktiviteter"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Hendelser"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Fra kommende kalenderaktiviteter"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillat at apper overstyrer"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Appunntak"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Vis over andre apper"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Tillat visning over andre apper"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Tillat at denne appen vises over andre apper du bruker. Den kan kanskje virke forstyrrende for andre apper eller endre måten de vises eller fungerer på."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Tilgang til alle filer"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Gi tilgang til å administrere alle filer"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Gi denne appen tillatelse til å lese, endre og slette alle filer på denne enheten eller tilkoblede lagringsvolum. Hvis du gir appen tillatelsen, kan den få tilgang til filer uten at du er klar over det."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Har tilgang til alle filer"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr, lyttetjeneste for virtuell virkelighet, stereo, hjelpetjenester"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Vis over andre apper"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> apper kan vises over andre apper"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 758ff54..2990f6c 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"गोपनीयता"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"प्रशासकद्वारा असक्षम पारिएको छ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"उपलब्ध छैन"</string>
     <string name="security_status_title" msgid="6958004275337618656">"सुरक्षाको स्थिति"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रिन लक, फेस अनलक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रिन लक, फिंगरप्रिन्ट"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"अनुप्रयोगहरूमा फेस अनलक प्रयोग गर्दा सधैँ पुष्टि गर्नु पर्ने बनाउनुहोस्"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"अनुहारसम्बन्धी डेटा मेटाउनु"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"फेस अनलक सेटअप गर्नुहोस्"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"आफ्नो यन्त्र अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक प्रयोग गर्नुहोस्।\n\nयाद राख्नुहोस्:\nतपाईंले अनलक गर्न नचाहेका बेला पनि फोनमा हेर्नुभयो भने फोन अनलक हुन सक्छ।\n\nतपाईंका आँखा खुला भएका बेला कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग धेरै मिल्दोजुल्दो अनुहार भएका तपाईंका छोराछोरी वा दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"आफ्नो यन्त्र अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक प्रयोग गर्नुहोस्।\n\nयाद राख्नुहोस्:\nफोनमा हेर्नुभयो भने तपाईंले अनलक गर्न नचाहेका बेला पनि फोन अनलक हुन सक्छ।\n\nअरू कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग धेरै मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"आफ्नो यन्त्र अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक प्रयोग गर्नुहोस्।\n\nयाद राख्नुहोस्:\nफोनमा हेर्नुभयो भने तपाईंले अनलक गर्न नचाहेका बेला पनि फोन अनलक हुन सक्छ।\n\nतपाईंका आँखा बन्द नै छन् भने पनि कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग धेरै मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"अनुहारसम्बन्धी डेटा मेट्ने हो?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"फेस अनलक सुविधाले प्रयोग गरेको डेटा सदाका लागि सुरक्षित रूपमा मेटाइने छ। हटाइसकेपछि, तपाईंलाई आफ्नो फोन अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न आफ्नो PIN, ढाँचा वा पासवर्ड आवश्यक हुने छ।"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"पहिचान गर्नुहोस्"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"अज्ञात पहिचान"</string>
     <string name="wifi_password" msgid="1458802324849513755">"पासवर्ड:"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE पासवर्डको पहिचानकर्ता"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"पासवर्ड देखाउनुहोस्"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ब्यान्ड चयन गर्नुहोस्"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"स्वतः निर्धारित"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"यो सेवामार्फत Wi‑Fi आदान प्रदान गर्दै…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"जडान गर्दै…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"हटस्पट आदान प्रदान गर्नुहोस्"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"यो तपाईं नै हो भन्ने पुष्टि गर्नुहोस्"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"तपाईं नै हुनुहुन्छ भन्ने पुष्टि गर्नुहोस्"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"सक्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"कहिल्यै पनि स्वतः निष्क्रिय हुने छैन"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सूर्योदयको बेला स्वतः निष्क्रिय हुने छ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"तपाईंको ब्याट्री अझै लामो समयसम्म टिकाएर राख्न अँध्यारो विषयवस्तुले मूल कालो रङको प्रयोग गर्दछ। अँध्यारो विषयवस्तु तपाईंको स्क्रिन निष्क्रिय नहुन्जेल सक्रिय नहुने समयतालिका तय गर्दछ।"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"केही स्क्रिनहरूमा तपाईंको ब्याट्री अझै लामो समयसम्म टिकाएर राख्न कालो रङको पृष्ठभूमि प्रयोग गर्दछ। अँध्यारो विषयवस्तु तपाईंको स्क्रिन निष्क्रिय नहुन्जेल सक्रिय नहुने समयतालिका तय गर्दछ।"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"स्क्रिन टाइम आउट हुने समय"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"स्क्रिन बन्द हुन्छ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रियता पछि"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"सुरक्षाका लागि ढाँचा सेट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"आफ्नो पासवर्ड पुन: प्रविष्टि गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"आफ्नो कार्यको पासवर्ड प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"आफ्नो कार्यको ढाँचा प्रविष्टि गर्नु…"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"आफ्नो PIN पुन: प्रविष्टि गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"आफ्नो कार्यको PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"पासवर्ड मेल खाँदैन"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN मिल्दैन"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"आफ्नो ढाँचा फेरि कोर्नुहोस्‌"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"मुख्तया दृष्टिविहीन र कम दृष्टि भएका व्यक्तिहरूको लागि स्क्रिन रिडर"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ठूलो आवाजमा सुन्न आफ्नो स्क्रिनमा भएका वस्तुहरूमा ट्याप गर्नुहोस्"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"क्याप्सनसम्बन्धी प्राथमिकताहरू"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"म्याग्निफिकेसन"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"म्याग्निफाई गर्नुहोस्"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"म्याग्निफिकेसन क्षेत्र"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"चालको नियन्त्रक देखाउनुहोस्"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"म्याग्निफिकेसन क्षेत्र सार्न जोएस्टिक जस्तो कुनै नियन्त्रक देखाउनुहोस्"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"सेटिङ म्याग्निफाई गर्नुहोस्"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"सर्टकट र तीन पटक ट्याप गरेर म्याग्निफाइ गर्नुहोस्"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Magnify बारे"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"विकल्पहरू"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"स्क्रिनमा जुम इन गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"जुम गर्न ३ पटक ट्याप गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"जुम गर्न बटनमा ट्याप गर्नुहोस्"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"सिम कार्ड चयन गर्नुहोस्"</string>
     <string name="color_orange" msgid="216547825489739010">"ओरेन्ज"</string>
     <string name="color_purple" msgid="6603701972079904843">"बैजनी"</string>
+    <string name="color_pink" msgid="8596872110888626708">"गुलाबी रङ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"कुनै SIM कार्ड राखिएको छैन"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"सिम अवस्था"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM को स्थिति (sim को सल्ट %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">१ समयतालिका सक्षम पारियो</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"बाधा नपुऱ्याउनुहोस् नामक मोडलाई सक्रिय गर्नुहोस्"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"अपवादहरू"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"दृश्य सम्बन्धी बाधालाई रोक्नु"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"सङ्केतहरूलाई देखिन दिनुहोस्"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"जब बाधा नपुर्‍याउनुहोस् सक्रिय छ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"आवाज निकाल्ने अवरोधहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"सूचनाहरूलाई प्रतिबन्ध लगाउनुहोस्"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"सूचनाहरूको कुनै पनि ध्वनि छैन"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"तपाईं आफ्नो स्क्रिनमा सूचनाहरू देख्नु हुने छ"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> समयतालिकाहरू स्वतः सक्रिय हुन सक्छन्‌</item>
       <item quantity="one">१ समयतालिका स्वतः सक्रिय हुन सक्छ</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"यन्त्र म्युट गर्नुहोस् तर अपवादलाई अनुमति दिनुहोस्‌"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"अपवादहरू"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"समयतालिका"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"सबै अपवादहरू हेर्नुहोस्"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"बाधा नपुऱ्याउनुहोस् नामक सुविधा सक्रिय भएको बेला अपवादहरू"</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_schedule" msgid="2003707171924226212">"समयतालिकाहरू"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"मौन पारिएका सूचनाहरू"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक आवाज तथा कम्पनलाई म्युट गरिने छ।"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"यीबाहेक सबै म्युट गर्नुहोस्"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"म्युट गरिएको छ"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">अन्य <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">अन्य १</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"वार्तालापहरू"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"सन्देशहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"अनुमति दिइएका सन्देशहरू आउँदा घन्टी बज्छ भन्ने कुरा सुनिश्चित गर्न आफ्नो यन्त्रलाई घन्टी बज्ने, कम्पन हुने वा मौन रहनेमध्ये कुन चाहिँ विकल्पमा सेट गरिएको छ भन्ने कुरा जाँच गर्नुहोस्।"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ का आगम कलहरूलाई रोक लगाइएको छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सूचीमा भएका अन्य मान्छेहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"कुनै पनि होइन"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"कुनै पनि कललाई अनुमति नदिनुहोस्‌"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"कुनै पनि सन्देशलाई अनुमति नदिनुहोस्‌"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"अलार्महरूलाई अनुमति दिनुहोस्"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"अलार्महरू"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"टाइमर, अलार्म, सुरक्षा प्रणाली र अन्य अनुप्रयोगहरू"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"अलार्महरू"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"मिडियाका ध्वनिहरू प्ले गर्नुहोस्"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"मिडियाका आवाजहरू"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"भिडियो, खेल र अन्य मिडियाहरूबाट"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"मिडिया"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"छुवाइसम्बन्धी ध्वनि अनुमति दिनुहोस्‌"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"छुवाइसम्बन्धी ध्वनि"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"तपाईंको किबोर्ड र अन्य बटनहरूबाट"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"छुवाइसम्बन्धी ध्वनि"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"रिमाइन्डरहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"रिमान्डरहरू"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"कार्य र रिमाइन्डरहरूबाट"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"रिमाइन्डरहरू"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"कार्यक्रमहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"कार्यक्रमहरू"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"पात्रोका आगामी कार्यक्रमहरूबाट"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"अनुप्रयोगहरूलाई ओभरराइड गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"अनुप्रयोगका अपवादहरू"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"अन्य अनुप्रयोगहरूको माथिपट्टि देखाउनुहोस्"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"अन्य एपहरूको माथिपट्टि देखिने अनुमति दिनुहोस्"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"यो अनुप्रयोगलाई तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको माथिपट्टि देखिन अनुमति दिनुहोस्। यसले तपाईंले गर्ने ती अनुप्रयोगहरूको प्रयोगमा हस्तक्षेप गर्न वा तिनीहरू देखा पर्ने वा तिनीहरूले काम गर्ने तरिकालाई परिवर्तन गर्न सक्छ।"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"सबै फाइलहरूमाथिको पहुँच"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"सबै फाइलहरूको व्यवस्थापन गर्न अनुमति दिनुहोस्"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"यो अनुप्रयोगलाई यो यन्त्र वा जोडिएको कुनै भण्डारण भोल्युममा रहेका सबै फाइलहरू पढ्ने, परिमार्जन गर्ने तथा मेट्ने अनुमति दिनुहोस्। अनुमति दिइएका खण्डमा यो अनुप्रयोगले तपाईंको स्पष्ट जानकारीविनै फाइलहरूमाथि पहुँच राख्न सक्छ।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"सबै फाइलहरूमाथि पहुँच राख्न सक्छ।"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr भर्चुअल रियालिटी श्रोता स्टेरियो सहायक सेवा"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"अन्य एपहरूको माथिपट्टि देखाउनु"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> मध्ये <xliff:g id="COUNT_0">%1$d</xliff:g> एपहरूलाई अन्य एपको माथिपट्टि देखिने अनुमति दिइएको छ"</string>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index ec0978b..c5f67fe 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -40,4 +40,8 @@
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
 
+    <!-- Material theme for the pages containing TabLayout and ViewPager -->
+    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>
+    </style>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c38137b..5717775 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"\'Mijn locatie\', schermontgrendeling, sim- en certificaatopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"\'Mijn locatie\' instellen, scherm ontgrendelen, certificaatopslag vergrendelen"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Uitgeschakeld door beheerder"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Niet beschikbaar"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Beveiligingsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Schermvergrendeling, ontgrendelen via gezichtsherkenning"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Schermvergrendeling, vingerafdruk"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Altijd bevestigingsstap vereisen bij ontgrendelen via gezichtsherkenning in apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Gezichtsinformatie verwijderen"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Ontgr. via gezichtsherkenning instellen"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Gebruik \'Ontgrendelen via gezichtsherkenning\' om je apparaat te ontgrendelen, in te loggen en betalingen te bevestigen.\n\nHoud rekening met het volgende:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden en je je ogen open hebt.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gebruik \'Ontgrendelen via gezichtsherkenning\' om je apparaat te ontgrendelen, in te loggen bij apps en betalingen te bevestigen.\n\nLet op:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gebruik \'Ontgrendelen via gezichtsherkenning\' om je apparaat te ontgrendelen, bij apps in te loggen en betalingen te bevestigen.\n\nHoud rekening met het volgende:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden, zelfs als je je ogen dicht hebt.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Gezichtsinformatie verwijderen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"De gezichtsinformatie die wordt gebruikt voor ontgrendelen via gezichtsherkenning, wordt definitief en op een veilige manier verwijderd. Nadat deze is verwijderd, heb je je pincode, patroon of wachtwoord nodig om je telefoon te ontgrendelen, in te loggen bij apps of betalingen te bevestigen."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteit"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonieme identiteit"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Wachtwoord"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE-wachtwoord-ID"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Wachtwoord weergeven"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Frequentieband voor toegangspunt selecteren"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatisch"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wifi delen met dit apparaat…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Verbinden…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspot delen"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Bevestig dat jij het bent"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifiëren dat jij het bent"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Wordt nooit automatisch uitgeschakeld"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wordt automatisch uitgeschakeld bij zonsopgang"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Het donkere thema gebruikt echt zwart als kleur zodat je batterij langer meegaat. Pas als je scherm uit is, wordt het ingestelde donkere thema geactiveerd."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Het donkere thema gebruikt een zwarte achtergrond zodat je batterij langer meegaat op sommige schermen. Schema\'s voor het donkere thema worden pas ingeschakeld als je scherm uit is."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Time-out voor scherm"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Stel pincode in voor gebruik van vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Stel een patroon in voor betere beveiliging"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Geef je wachtwoord opnieuw op"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Geef je werkwachtwoord op"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Je patroon bevestigen"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Geef je werkpatroon op"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Geef je pincode opnieuw op"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Geef je werkpincode op"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Wachtwoorden komen niet overeen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Pincodes komen niet overeen"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Teken het patroon opnieuw"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Schermlezer voornamelijk voor blinden en slechtzienden"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tik op items op je scherm om ze hardop te laten voorlezen"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Voorkeuren voor ondertiteling"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Vergroten"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingsgebied"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Verplaatsingscontroller weergeven"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Hiermee wordt een controller weergegeven om het vergrotingsgebied te verplaatsen."</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Instellingen voor 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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Vergroten met sneltoets en drie keer tikken"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Over Vergroten"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opties"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Inzoomen op scherm"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tik drie keer om te zoomen"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zoomen door te tikken op een knop"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Simkaart selecteren"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranje"</string>
     <string name="color_purple" msgid="6603701972079904843">"Paars"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Roze"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Geen simkaarten geplaatst"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Simkaartstatus"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Simkaartstatus (simkaartsleuf %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 ingeschakeld</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Schakel Niet storen in."</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Uitzonderingen"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkeer visuele onderbreking"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Visuele signalen toestaan"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Wanneer \'Niet storen\' is ingeschakeld"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Onderbrekingen toestaan die een geluid laten horen"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Meldingen beperken"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Geen geluid van meldingen"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Je ziet meldingen op je scherm"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Geluid van apparaat uitzetten maar uitzonderingen toestaan"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Uitzonderingen"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Planning"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Alle uitzonderingen bekijken"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Uitzonderingen als \'Niet storen\' is ingeschakeld"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Mensen"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Wekkers en andere onderbrekingen"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Planningen"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Meldingen zonder geluid"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Wanneer \'Niet storen\' is ingeschakeld, worden geluiden en trillingen gedempt, behalve voor de items die je hierboven toestaat."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Alles dempen behalve"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Gedempt"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Gesprekken"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Berichten toestaan"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Controleer of je apparaat op geluid, trillen of stil staat, zodat je zeker weet dat toegestane berichten geluid maken."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Geen"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Geen gesprekken toestaan"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Geen berichten toestaan"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Wekkers toestaan"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Wekkers"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Van timers, wekkers, beveiligingssystemen en andere apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"wekkers"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Mediageluiden afspelen"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Mediageluiden"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Van video\'s, games en andere media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Aanraakgeluiden toestaan"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Aanraakgeluiden"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Van je toetsenbord en andere knoppen"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"aanraakgeluiden"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Herinneringen toestaan"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Herinneringen"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Van taken en herinneringen"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"herinneringen"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Afspraken toestaan"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Evenementen"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Van aankomende agenda-afspraken"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Apps toestaan dit te negeren"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"App-uitzonderingen"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Weergeven vóór andere apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Weergeven vóór andere apps toestaan"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Deze app toestaan op de voorgrond te worden weergegeven vóór andere apps die je gebruikt. Dit kan je gebruik van die apps verstoren of de manier wijzigen waarop die apps worden weergegeven of zich gedragen."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Toegang tot alle bestanden"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Toegang geven om alle bestanden te beheren"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Toestaan dat deze app alle bestanden op dit apparaat of gekoppelde opslagvolumes kan lezen, aanpassen of verwijderen. Indien verleend, kan de app zonder jouw medeweten toegang tot bestanden krijgen."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Mag toegang tot alle bestanden hebben"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reality listener stereo helperservice"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Weergeven vóór andere apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> apps mogen worden weergegeven vóór andere apps"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 9bc0ef0..c783666 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ମୋ ଅବସ୍ଥାନ, ସ୍କ୍ରିନ୍‌ ଅନଲକ୍‌, SIM କାର୍ଡ ଲକ୍‌, ପରିଚୟ ଷ୍ଟୋରେଜ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ମୋ ଲୋକେସନ୍‌, ସ୍କ୍ରୀନ୍‌ ଅନ୍‌ଲକ୍‌, ତଥ୍ୟ ଷ୍ଟୋରେଜ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ଗୋପନୀୟତା"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ଆଡମିନ୍‌ଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ସୁରକ୍ଷା ସ୍ଥିତି"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ସ୍କ୍ରିନ୍‍ ଲକ୍‌, ଫେସ୍‌ ଅନ୍‌ଲକ୍‌"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌, ଟିପଚିହ୍ନ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ଆପ୍ସରେ ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ସମୟରେ, ସୁନିଶ୍ଚିତକରଣ ଷ୍ଟେପ୍ ସର୍ବଦା ଆବଶ୍ୟକ ହୋଇଥାଏ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ମୁହଁର ଡାଟା ଡିଲିଟ୍ କରନ୍ତୁ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ଅନ୍‌ଲକ୍ କରିବା, ଆପ୍‌ରେ ସାଇନ୍ ଇନ୍ କରିବା, ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।\n\nମନେ ରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଯଦି ଆପଣଙ୍କ ଫୋନ୍‍କୁ ଦେଖିନ୍ତି, ତେବେ ଏହା ଅନ୍‍ଲକ୍ ହୋଇଯାଇପାରେ।\n\nଆପଣଙ୍କର ଆଖି ଖୋଲାଥିବା ବେଳେ ଆପଣଙ୍କର ମୁହଁ ପାଖରେ ରଖି କେହିବି ଆପଣଙ୍କର ଫୋନ୍‍କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ।\n\nଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ, ଯେପରିକି ଆପଣଙ୍କ ଭାଇ/ଭଉଣୀ।"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ଆପଣଙ୍କର ଡିଭାଇସ୍ ଅନଲକ୍ କରିବା, ଆପ୍ସରେ ସାଇନ୍ ଇନ୍ କରିବା ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।\n\nମନେରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଯଦି ଆପଣଙ୍କ ଫୋନକୁ ଦେଖନ୍ତି, ତେବେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nକେହିବି ଯଦି ଆପଣଙ୍କର ଫୋନକୁୁ ଆପଣଙ୍କ ମୁହଁ ପାଖରେ ରଖନ୍ତିି ତେବେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା ବ୍ୟକ୍ତି, ଯେକେହି ଆପଣଙ୍କର ପରି କହିପାରୁଥିବେ, ଯେପରିକି ଆପଣଙ୍କର ଭାଇ/ଭଉଣୀ ଆପଣଙ୍କର ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ।"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ଅନ୍‌ଲକ୍ କରିବା, ଆପ୍‌ରେ ସାଇନ୍ ଇନ୍ କରିବା, ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।\n\nମନେ ରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଯଦି ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଦେଖିନ୍ତି, ତେବେ ଏହା ଅନ୍‌ଲକ୍ ହୋଇଯାଇପାରେ।\n\nଆପଣଙ୍କର ଆଖି ବନ୍ଦ ଥିବା ବେଳେ ମଧ୍ୟ କେହିବି ଆପଣଙ୍କର ମୁହଁ ସାମ୍ନାରେ ଫୋନ୍ ରଖି ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ।\n\nଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା, କଥା କହୁଥିବା ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ, ଯେପରିକି ଆପଣଙ୍କ ଭାଇ/ଭଉଣୀ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ମୁହଁର ଡାଟା ଡିଲିଟ୍ କରିବେ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ଫେସ୍ ଅନ୍‌ଲକ୍ ଦ୍ୱାରା ବ୍ୟବହାର କରାଯାଇଥିବା ଫେସ୍ ଡାଟା ସ୍ଥାୟୀ ଏବଂ ସୁରକ୍ଷିତ ଭାବରେ ଡିଲିଟ୍ କରିଦିଆଯିବ। କାଢ଼ି ଦେବା ପରେ, ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିବା, ଆପ୍‌ଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଆପଣ ଆପଣଙ୍କର ପିନ୍, ପାଟର୍ନ ବା ପାସ୍‌ୱାର୍ଡ ଆବଶ୍ୟକ କରିବେ।"</string>
@@ -766,8 +766,7 @@
     <string name="wifi_tap_to_sign_in" msgid="8658506618807549483">"ନେଟୱର୍କରେ ସାଇନ୍‌-ଇନ୍‌ କରିବାକୁ ଏଠାରେ ଟ୍ୟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
-    <!-- no translation found for link_speed (931786745741016446) -->
-    <skip />
+    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> ୱାଇ-ଫାଇ ଅନ୍‌ କରିବାକୁ ଚାହାଁନ୍ତି"</string>
     <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> ୱାଇ-ଫାଇ ବନ୍ଦ କରିବାକୁ ଚାହୁଁଛି"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"debuggable ଆପ୍‍ର bytecode ଯାଞ୍ଚ କରାନ୍ତୁ"</string>
@@ -775,10 +774,8 @@
     <string name="show_refresh_rate" msgid="5742688821872354973">"ରିଫ୍ରେସ୍ ରେଟ୍ ଦେଖାନ୍ତୁ"</string>
     <string name="show_refresh_rate_summary" msgid="3558118122374609663">"ବର୍ତ୍ତମାନର ଡିସ୍‌ପ୍ଲେ ରିଫ୍ରେସ୍ ରେଟ୍ ଦେଖାନ୍ତୁ"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
-    <!-- no translation found for nfc_quick_toggle_summary (3622326550467939809) -->
-    <skip />
-    <!-- no translation found for nfc_quick_toggle_summary (1460871052409162980) -->
-    <skip />
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"ଟାବଲେଟ୍ ଏକ NFC ଡିଭାଇସକୁ ଛୁଇଁଲେ ଡାଟା ବିନିମୟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"ଫୋନ୍ ଏକ NFC ଡିଭାଇସକୁ ଛୁଇଁଲେ ଡାଟା ବିନିମୟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"NFC ଅନ୍ କରନ୍ତୁ"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC ଏହି ଡିଭାଇସ୍‌ ଏବଂ ଅନ୍ୟ ନିକଟସ୍ଥ ଡିଭାଇସ କିମ୍ବା ଧାର୍ଯ୍ୟ, ଯେପରିକି ଦେୟ ଟର୍ମିନାଲ୍‌ସ, ଆକସେସ୍‌ ରିଡରସ୍, ଏବଂ ଇଣ୍ଟରାକ୍ଟିଭ ଆଡସ୍‌ କିମ୍ବା ଟ୍ୟାଗସ୍‌ ମଧ୍ୟରେ ଡାଟା ପ୍ରତିବଦଳ କରେ।"</string>
     <string name="nfc_secure_settings_title" msgid="8947380729696717356">"NFC ସୁରକ୍ଷିତ କରନ୍ତୁ"</string>
@@ -880,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ପରିଚୟ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ଅଜ୍ଞାତ ପରିଚୟ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"ପାସ୍‌ୱର୍ଡ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE ପାସ୍‌ୱାର୍ଡ ଚିହ୍ନଟକାରୀ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"ପାସ୍‍ୱର୍ଡ ଦେଖାନ୍ତୁ"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ବ୍ୟାଣ୍ଡ ବାଛନ୍ତୁ"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ସ୍ୱତଃ"</string>
@@ -921,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ଏହି ଡିଭାଇସ୍ ସହ ୱାଇ-ଫାଇ ସେୟାର୍ କରାଯାଉଛି…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"ସଂଯୋଗ କରୁଛି…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ହଟସ୍ପଟ୍‌ ସେୟାର୍ କରନ୍ତୁ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ସୁନିଶ୍ଚିତ କରାନ୍ତୁ ଏହା ଆପଣ ଅଟନ୍ତି"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରନ୍ତୁ"</string>
     <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" 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>
@@ -1229,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ଚାଲୁ ଅଛି / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"କେବେ ବି ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ ହେବନାହିଁ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ସକାଳେ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ ହେବ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ଅଧିକ ସମୟ ସକ୍ରିୟ ରଖିବାକୁ ଗାଢ଼ ଥିମ୍, କଳା ରଙ୍ଗ ବ୍ୟବହାର କରିଥାଏ। ଆପଣଙ୍କ ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବା ପରେ ଗାଢ଼ ଥିମ୍ ଚାଲୁ ହେବା ପାଇଁ ସମୟ ନିର୍ଦ୍ଧାରିତ ହୋଇଥାଏ।"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"କିଛି ସ୍କ୍ରିନରେ ବ୍ୟାଟେରୀକୁ ଅଧିକ ସମୟ ସକ୍ରିୟ ରଖିବାରେ ସାହାଯ୍ୟ କରିବାକୁ ଗାଢ଼ା ଥିମ୍, ଏକ କଳା ରଙ୍ଗ ପୃଷ୍ଠପଟ ବ୍ୟବହାର କରିଥାଏ। ଆପଣଙ୍କ ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବା ପରେ ଗାଢ଼ା ଥିମ୍ ଚାଲୁ ହେବା ପାଇଁ ସ୍କିଡ୍ୟୁଲ୍ ହୋଇଥାଏ।"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ସ୍କ୍ରିନ୍ ସମୟ ସମାପ୍ତିର ଅବଧି"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"ସ୍କ୍ରୀନ୍‌ ବନ୍ଦ‌ ହୁଏ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ନିଷ୍କ୍ରିୟତାର <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ପରେ"</string>
@@ -1717,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବା ପାଇଁ PIN ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ସୁରକ୍ଷା ପାଇଁ ପାଟର୍ନ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ପାସ୍‌ୱର୍ଡ ପୁନଃ-ପ୍ରବେଶ କରନ୍ତୁ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ଆପଣଙ୍କର କାର୍ଯ୍ୟସ୍ଥଳୀ ପାସୱାର୍ଡ ଲେଖନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ଆପଣଙ୍କ ପ୍ୟାଟର୍ନ ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ଆପଣଙ୍କ କାର୍ଯ୍ୟସ୍ଥଳୀ ପାଟର୍ନ ଲେଖନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ଆପଣଙ୍କ PIN ପୁଣି ଲେଖନ୍ତୁ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ଆପଣଙ୍କ କାର୍ଯ୍ୟସ୍ଥଳୀ PIN ଲେଖନ୍ତୁ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"ପାସ୍‌ୱର୍ଡ ମେଳ ଖାଉନାହିଁ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ପିନ୍‌ ମେଳ ଖାଉନାହିଁ"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ଆପଣଙ୍କର ପାଟର୍ନ ପୁଣି ଆଙ୍କନ୍ତୁ"</string>
@@ -2054,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ଅନ୍ଧ କିମ୍ବା କମ୍‌ ଦୃଷ୍ଟି ଶକ୍ତିଥିବା ଲୋକଙ୍କ ପାଇଁ ମୁଖ୍ୟତଃ ସ୍କ୍ରିନ୍‌ ରିଡର୍‌ ଅଟେ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ଜୋରରେ ପଢ଼ିବା ପାଇଁ ସ୍କ୍ରୀନ୍‌ ଉପରେ ଥିବା ଆଇଟମଗୁଡ଼ିକ ଉପରେ ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"କ୍ୟାପସନ୍ ପସନ୍ଦଗୁଡ଼ିକ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ବଡ଼ କରିବା"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ଘୁଞ୍ଚାଇବା କଣ୍ଟ୍ରୋଲର୍ ଦେଖାନ୍ତୁ"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ ଘୁଞ୍ଚାଇବାକୁ ଏକ ଜୟଷ୍ଟିକ୍-ପରି କଣ୍ଟ୍ରୋଲର୍ ଦେଖାନ୍ତୁ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ମାଗ୍ନିଫାଏ ସେଟିଂସ୍"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ତିନି ଥର ଟାପ୍ ଓ ସର୍ଟକଟ୍ ସାହାଯ୍ୟରେ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"ମାଗ୍ନିଫାଏ ବିଷୟରେ"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ସ୍କ୍ରୀନ୍‌ ଉପରେ ଜୁମ୍‌ ଇନ୍‌ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ଜୁମ୍‌ କରିବାକୁ 3ଥର ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ଜୁମ୍‌ କରିବା ପାଇଁ ଗୋଟିଏ ବଟନ୍‌ ଉପରେ ଟାପ୍‌ କରନ୍ତୁ"</string>
@@ -3087,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"ସିମ୍‌ କାର୍ଡ ଚୟନ କରନ୍ତୁ"</string>
     <string name="color_orange" msgid="216547825489739010">"କମଳା"</string>
     <string name="color_purple" msgid="6603701972079904843">"ବାଇଗଣୀ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ଗୋଲାପୀ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"କୌଣସି ସିମ କାର୍ଡ ଭର୍ତ୍ତି କରାଯାଇ ନାହିଁ"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM ଷ୍ଟାଟସ୍"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIMର ସ୍ଥିତି (SIM ସ୍ଲଟ୍‌ %1$d)"</string>
@@ -3127,8 +3131,7 @@
     <string name="search_results_title" msgid="3360639917793022533">"ସେଟିଙ୍ଗ"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ନେଟ୍‌ୱର୍କ କନେକ୍ସନ୍, ଇଣ୍ଟରନେଟ୍, ୱାୟରଲେସ୍, ଡାଟା, ୱାଇ ଫାଇ"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"ୱାଇ-ଫାଇ ବିଜ୍ଞପ୍ତି, ୱାଇଫାଇ ବିଜ୍ଞପ୍ତି"</string>
-    <!-- no translation found for keywords_wifi_data_usage (4718555409695862085) -->
-    <skip />
+    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"ଡାଟା ବ୍ୟବହାର"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"ଭାଇବ୍ରେଶନ୍‌କୁ ବନ୍ଦ କରନ୍ତୁ, ଟାପ୍, କୀବୋର୍ଡ"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"24-ଘଣ୍ଟିଆ ଫର୍ମାଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"ଡାଉନଲୋଡ୍‌"</string>
@@ -3250,6 +3253,7 @@
       <item quantity="one">1ଟି ସକ୍ଷମ କରାଯାଇଛି</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍ କରନ୍ତୁ"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ବ୍ୟତିକ୍ରମ"</string>
@@ -3276,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ଭିଜୁଆଲ୍‌ ବାଧା ଅବରୋଧ କରନ୍ତୁ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ଭିଜୁଆଲ୍‌ ସଙ୍କେତ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ ଚାଲୁଥିବା ବେଳେ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ବାଧାଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଶବ୍ଦ କରେ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ବିଜ୍ଞପ୍ତିକୁ ସୀମାବଦ୍ଧ କରନ୍ତୁ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନାହିଁ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ଆପଣ ଆପଣଙ୍କର ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତି ଦେଖିବେ"</string>
@@ -3337,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>ଥର ସୂଚୀ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
       <item quantity="one">1ଥର ସୂଚୀ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"ଡିଭାଇସ୍‌ ମ୍ୟୁଟ୍‌ କରନ୍ତୁ କିନ୍ତୁ ବ୍ୟତିକ୍ରମଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ବ୍ୟତିକ୍ରମ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"ନିର୍ଦ୍ଧାରିତ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ସମସ୍ତ ବ୍ୟତିକ୍ରମଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ ଚାଲୁଥିବା ବେଳେ ବ୍ୟତିକ୍ରମ"</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_schedule" msgid="2003707171924226212">"ସିଡୁଲ୍"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ନୀରବ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେଶନ୍ ମ୍ୟୁଟ୍ ହୋଇଯିବ।"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ଏହା ବ୍ୟତୀତ ସମସ୍ତକୁ ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ମ୍ୟୁଟ୍‌ କରାଗଲା"</string>
@@ -3600,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g>ଟି ଅନ୍ୟ</item>
       <item quantity="one">1ଟି ଅନ୍ୟ</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"ମେସେଜ୍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ଅନୁମତି ଦିଆଯାଇଥିବା ମେସେଜ୍ ଆସିବା ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ସାଉଣ୍ଡ ହେବ, ଏହା ନିଶ୍ଚିତ କରିବା ପାଇଁ, ଏହା ରିଙ୍ଗ, ଭାଇବ୍ରେଟ୍, ବା ନୀରବରେ ସେଟ୍ କରିଯାଇଛି କି ନାହିଁ ତାହା ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
@@ -3613,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"କିଛି ନୁହେଁ"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"କୌଣସି କଲ୍‍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ ନାହିଁ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"କୌଣସି ମେସେଜ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ ନାହିଁ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"ଆଲ୍‍ରାମ୍‍ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ଆଲାର୍ମ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ଟାଇମର୍, ଆଲାରାମ୍, ସୁରକ୍ଷା ସିଷ୍ଟମ୍ ଏବଂ ଅନ୍ୟ ଆପ୍ସରୁ"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ଆଲାର୍ମ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"ମିଡିଆ ସାଉଣ୍ଡକୁ ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"ମିଡିଆ ଶବ୍ଦ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ଭିଡିଓ, ଗେମ୍ ଏବଂ ଅନ୍ୟ ମିଡିଆରୁ"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ମିଡ଼ିଆ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ସ୍ପର୍ଶଜନିତ ସାଉଣ୍ଡ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ସ୍ପର୍ଶଜନିତ ସାଉଣ୍ଡ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ଆପଣଙ୍କ କୀ\'ବୋର୍ଡ ଏବଂ ଅନ୍ୟ ବଟନଗୁଡ଼ିକରୁ"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ସ୍ପର୍ଶଜନିତ ଧ୍ୱନି"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"ରିମାଇଣ୍ଡର୍‍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"ରିମାଇଣ୍ଡର"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ଟାସ୍କ ଏବଂ ରିମାଇଣ୍ଡରଗୁଡ଼ିକରୁ"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ରିମାଇଣ୍ଡର୍‌"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ଇଭେଣ୍ଟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ଇଭେଣ୍ଟ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ଆଗାମୀ କ୍ୟାଲେଣ୍ଡର୍ ଇଭେଣ୍ଟଗୁଡ଼ିକରୁ"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ନିଷ୍କ୍ରିୟ କରିବାକୁ ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ଆପ୍‍ର ବ୍ୟତିକ୍ରମ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3917,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଅ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ପ୍ରଦର୍ଶନ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଏହି ଆପ୍‌କୁ ରହିବାକୁ ଦିଅନ୍ତୁ। ସେହି ଆପ୍‌ଗୁଡ଼ିକର ବ୍ୟବହାରରେ ଏହା ବାଧା ସୃଷ୍ଟି କରିପାରେ କିମ୍ୱା ସେଗୂଡ଼ିକର କାମ କରିବା ଶୈଳୀକୁ ବଦଳାଇଦେଇପାରେ।"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ସମସ୍ତ ଫାଇଲକୁ ଆକ୍ସେସ୍"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ସମସ୍ତ ଫାଇଲକୁ ପରିଚାଳନା ପାଇଁ ଆକ୍ସେସ୍ ଦିଅନ୍ତୁ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ଏହି ଡିଭାଇସ୍ କିମ୍ବା ଯେ କୌଣସି ସଂଯୁକ୍ତ ଥିବା ଷ୍ଟୋରେଜ୍ ଭଲ୍ୟୁମରେ ଥିବା ସମସ୍ତ ଫାଇଲକୁ ପଢ଼ିବା, ପରିବର୍ତ୍ତନ କରିବା ଏବଂ ଡିଲିଟ୍ କରିବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଆପ୍ ଆପଣଙ୍କୁ ସ୍ପଷ୍ଟ ନକରି ଫାଇଲଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିପାରେ।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ସମସ୍ତ ଫାଇଲକୁ ଆକ୍ସେସ୍ କରିପାରିବ"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr ଭର୍ଚୁଆଲ୍‌ ରିଅଲିଟୀ ଲିସ୍‌ନର୍‌ ଷ୍ଟେରିଓ ସାହାଯ୍ୟକାରୀ ସେବା"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେଉ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> ଟି ଆପ୍‌ରୁ <xliff:g id="COUNT_0">%1$d</xliff:g> ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକରେ ଡିସପ୍ଲେ କରିବାକୁ ଅନୁମୋଦିତ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index b14660c..a4698be 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਸਿਮ ਕਾਰਡ ਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ਪਰਦੇਦਾਰੀ"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ਸੁਰੱਖਿਆ ਸਥਿਤੀ"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ਸਕ੍ਰੀਨ ਲਾਕ, ਚਿਹਰਾ ਅਣਲਾਕ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ਸਕ੍ਰੀਨ ਲਾਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ਐਪਾਂ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਵੇਲੇ ਪੁਸ਼ਟੀਕਰਨ ਪੜਾਅ ਹਮੇਸ਼ਾਂ ਲੋੜੀਂਦਾ ਹੈ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ਆਪਣਾ ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੋਣ \'ਤੇ ਵੀ ਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਵੀ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਇੱਕੋ ਜਿਹੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ਆਪਣਾ ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਤਸਦੀਕ ਕਰੋ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਵੱਲ ਦੇਖਦੇ ਸਾਰ ਹੀ ਇਹ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਵੀ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਵੀ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਇੱਕੋ ਜਿਹੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ਆਪਣਾ ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਬੰਦ ਹੋਣ।\n\nਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਵੀ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਇੱਕੋ ਜਿਹੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ਕੀ ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ਚਿਹਰਾ ਅਣਲਾਕ ਰਾਹੀਂ ਵਰਤਿਆ ਗਿਆ ਚਿਹਰਾ ਡਾਟਾ ਪੱਕੇ ਤੌਰ \'ਤੇ ਅਤੇ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਮਿਟਾਇਆ ਜਾਵੇਗਾ। ਮਿਟਾਉਣ ਤੋਂ ਬਾਅਦ, ਤੁਹਾਨੂੰ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣੇ ਪਿੰਨ, ਪੈਟਰਨ ਜਾਂ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ਪਛਾਣ"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ਅਨਾਮ ਪਛਾਣ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"ਪਾਸਵਰਡ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE ਪਾਸਵਰਡ ਪਛਾਣਕਰਤਾ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"ਪਾਸਵਰਡ ਦਿਖਾਓ"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ਬੈਂਡ ਦੀ ਚੋਣ ਕਰੋ"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ਸਵੈਚਲਿਤ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਵਾਈ-ਫਾਈ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ਹੌਟਸਪੌਟ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਇਹ ਤੁਸੀਂ ਹੋ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗਾ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ਸੂਰਜ ਚੜ੍ਹਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗਾ"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ਗੂੜ੍ਹਾ ਥੀਮ ਬੈਟਰੀ ਨੂੰ ਲੰਬੇ ਸਮੇਂ ਤੱਕ ਬਚਾਈ ਰੱਖਣ ਵਿੱਚ ਮਦਦ ਲਈ ਕਾਲੇ ਰੰਗ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ ਤੱਕ ਚਾਲੂ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ।"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ਕੁਝ ਸਕ੍ਰੀਨਾਂ \'ਤੇ ਗੂੜ੍ਹਾ ਥੀਮ ਬੈਟਰੀ ਨੂੰ ਵਧੇਰੇ ਲੰਬੇ ਸਮੇਂ ਤੱਕ ਬਚਾਈ ਰੱਖਣ ਵਿੱਚ ਮਦਦ ਲਈ ਕਾਲੇ ਰੰਗ ਦੇ ਬੈਕਗ੍ਰਾਊਂਡ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ ਤੱਕ ਚਾਲੂ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੈ"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਤੱਕ ਕੋਈ ਸਰਗਰਮੀ ਨਾ ਹੋਣ \'ਤੇ"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ਸੁਰੱਖਿਆ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ਆਪਣਾ ਕਾਰਜ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ਆਪਣਾ ਕਾਰਜ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ਆਪਣਾ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ਆਪਣਾ ਕਾਰਜ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ਆਪਣਾ ਪੈਟਰਨ ਦੁਬਾਰਾ ਉਲੀਕੋ"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ਸਕ੍ਰੀਨ ਰੀਡਰ ਮੁੱਖ ਤੌਰ \'ਤੇ ਨੇਤਰਹੀਣਾਂ ਅਤੇ ਘੱਟ ਨਜ਼ਰ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਹੈ"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀਆਂ ਆਈਟਮਾਂ ਨੂੰ ਉੱਚੀ ਅਵਾਜ਼ ਵਿੱਚ ਸੁਣਨ ਲਈ ਉਹਨਾਂ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ਸੁਰਖੀ ਤਰਜੀਹਾਂ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ਵੱਡਦਰਸ਼ੀਕਰਨ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ਵੱਡਦਰਸ਼ੀ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ਹਲਚਲ ਕਰਨ ਵਾਲਾ ਕੰਟਰੋਲਰ ਦਿਖਾਓ"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ ਨੂੰ ਹਿਲਾਉਣ ਲਈ ਜੌਇਸਟਿੱਕ-ਵਰਗਾ ਕੰਟਰੋਲਰ ਦਿਖਾਓ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਸੈਟਿੰਗਾਂ"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ਸ਼ਾਰਟਕੱਟ ਅਤੇ ਤਿੰਨ-ਟੈਪ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"ਵੱਡਦਰਸ਼ੀ ਬਾਰੇ"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ਵਿਕਲਪ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾਓ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"ਜ਼ੂਮ ਕਰਨ ਲਈ 3 ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ਜ਼ੂਮ ਕਰਨ ਲਈ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM ਕਾਰਡ ਚੁਣੋ"</string>
     <string name="color_orange" msgid="216547825489739010">"ਸੰਤਰੀ"</string>
     <string name="color_purple" msgid="6603701972079904843">"ਜਾਮਨੀ"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ਗੁਲਾਬੀ"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ ਪਾਏ"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"ਸਿਮ ਸਥਿਤੀ"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"ਸਿਮ ਅਵਸਥਾ (ਸਿਮ ਸਲੌਟ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ਇਨ੍ਹਾਂ ਤੋਂ ਇਲਾਵਾ"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਗੜਬੜੀਆਂ ਬਲਾਕ ਕਰੋ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਸਿਗਨਲ ਦਿਖਣ ਦਿਓ"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ਧੁਨੀ ਵਜਾਉਣ ਵਾਲੀਆਂ ਰੁਕਾਵਟਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ਸੂਚਨਾਵਾਂ ਦੀ ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ਤੁਸੀਂ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋਗੇ"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"ਡੀਵਾਈਸ ਮਿਊਟ ਕਰੋ, ਪਰ ਅਪਵਾਦਾਂ ਦਿਖਾਉਣ ਦਿਓ"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ਅਪਵਾਦ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"ਸਮਾਂ-ਸੂਚੀ"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ਸਾਰੇ ਅਪਵਾਦਾਂ ਨੂੰ ਦੇਖੋ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਅਪਵਾਦ"</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_schedule" msgid="2003707171924226212">"ਸਮਾਂ-ਸੂਚੀਆਂ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"ਖਮੋਸ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ ਨੂੰ ਮਿਊਟ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ਇਸਤੋਂ ਇਲਾਵਾ ਸਭ ਮਿਊਟ ਕਰੋ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਆਉਣ ਦਿਓ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ਸੁਨੇਹਿਆਂ ਨੂੰ ਧੁਨੀ ਵਜਾਉਣ ਦੇਣ ਲਈ, ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਘੰਟੀ, ਥਰਥਰਾਹਟ ਜਾਂ ਖਾਮੋਸ਼ੀ \'ਤੇ ਸੈੱਟ ਹੈ।"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ਲਈ ਇਨਕਮਿੰਗ ਸੁਨੇਹੇ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਮੈਂਬਰਾਂ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਨੂੰ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ਕਿਸੇ ਤੋਂ ਵੀ ਨਹੀਂ"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ਕਿਸੇ ਵੀ ਕਾਲ ਦੀ ਇਜਾਜ਼ਤ ਨਾ ਦਿਓ"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ਕਿਸੇ ਵੀ ਸੁਨੇਹੇ ਦੀ ਇਜਾਜ਼ਤ ਨਾ ਦਿਓ"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"ਅਲਾਰਮ ਵੱਜਣ ਦਿਓ"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ਅਲਾਰਮ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"ਟਾਈਮਰ, ਅਲਾਰਮ, ਸੁਰੱਖਿਆ ਸਿਸਟਮ ਅਤੇ ਹੋਰ ਐਪਾਂ ਤੋਂ"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ਅਲਾਰਮ"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"ਮੀਡੀਆ ਧੁਨੀਆਂ ਚਲਾਓ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"ਮੀਡੀਆ ਧੁਨੀਆਂ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"ਵੀਡੀਓ, ਗੇਮਾਂ ਅਤੇ ਹੋਰ ਮੀਡੀਆ ਤੋਂ"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ਮੀਡੀਆ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ਸਪਰਸ਼ ਧੁਨੀਆਂ ਚੱਲਣ ਦਿਓ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ਸਪੱਰਸ਼ ਧੁਨੀਆਂ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ਤੁਹਾਡੇ ਕੀ-ਬੋਰਡ ਅਤੇ ਹੋਰ ਬਟਨਾਂ ਤੋਂ"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ਸਪਰਸ਼ ਧੁਨੀਆਂ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"ਯਾਦ-ਸੂਚਨਾਵਾਂ ਨੂੰ ਦਿਖਾਉਣ ਦਿਓ"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ਕਾਰਜਾਂ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ ਤੋਂ"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ਇਵੈਂਟ ਦਿਖਾਉਣ ਦਿਓ"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ਇਵੈਂਟ"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ਆਗਾਮੀ ਕੈਲੰਡਰ ਇਵੈਂਟਾਂ ਤੋਂ"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ਐਪਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਨ ਦਿਓ"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ਐਪ ਅਪਵਾਦ"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"ਦੂਜੀਆਂ ਐਪਾਂ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਦਿਓ"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ਇਸ ਐਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਜਾਂ ਇਸ ਨਾਲ ਕਨੈਕਟ ਕਿਸੇ ਵੀ ਸਟੋਰੇਜ ਭਾਗ ਦੀਆਂ ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਪੜ੍ਹਨ, ਸੋਧਣ ਅਤੇ ਮਿਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ। ਜੇ ਇਜਾਜ਼ਤ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ, ਤਾਂ ਐਪ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕੀਤੇ ਬਿਨਾਂ ਫਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"ਇਹ ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR ਆਭਾਸੀ ਵਾਸਤਵਿਕਤਾ ਸਰੋਤਾ ਸਟੀਰੀਓ ਸਹਾਇਕ ਸੇਵਾ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਉੱਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aa7bccf..68e7ab3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Prywatność"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Wyłączone przez administratora"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Niedostępne"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Stan zabezpieczeń"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blokada ekranu, rozpoznawanie twarzy"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blokada ekranu, odcisk palca"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Zawsze wymagaj potwierdzenia, gdy używasz rozpoznawania twarzy w aplikacjach"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Usuń dane twarzy"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurowanie rozpoznawania twarzy"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Rozpoznawanie twarzy umożliwia odblokowanie urządzenia, logowanie do aplikacji i zatwierdzanie płatności.\n\nPamiętaj:\nPatrząc na telefon, możesz go niezamierzenie odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy, gdy masz otwarte oczy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Rozpoznawanie twarzy umożliwia odblokowywanie urządzenia, logowanie się w aplikacjach i zatwierdzanie płatności.\n\nPamiętaj:\nPatrząc na telefon, możesz go niechcący odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Rozpoznawanie twarzy umożliwia odblokowywanie urządzenia, logowanie się do aplikacji i zatwierdzanie płatności.\n\nPamiętaj:\nPatrząc na telefon, możesz go mimowolnie odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy – nawet wtedy, gdy masz zamknięte oczy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Usunąć dane twarzy?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Dane twarzy używane przez rozpoznawanie twarzy zostaną trwale i bezpiecznie usunięte. Po usunięciu danych do odblokowania telefonu, logowania się w aplikacjach i potwierdzania płatności będziesz potrzebować kodu PIN, wzoru lub hasła."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Tożsamość"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Tożsamość anonimowa"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Hasło"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identyfikator hasła SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Pokaż hasło"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Wybierz pasmo punktu dostępu"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatycznie"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Udostępniam Wi‑temu urządzeniu…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Łączę…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Udostępnij hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potwierdź swoją tożsamość"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potwierdź swoją tożsamość"</string>
     <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">"Połącz automatycznie"</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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Włączono / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nigdy nie wyłączy się automatycznie"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wyłączy się automatycznie o wschodzie słońca"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tryb ciemny wykorzystuje głęboką czerń, by pomóc wydłużyć czas pracy baterii. Harmonogramy trybu ciemnego są uruchamiane dopiero po wyłączeniu ekranu."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"W trybie ciemnym czarne tło na niektórych ekranach pomaga wydłużyć czas pracy baterii. Harmonogramy trybu ciemnego są uruchamiane dopiero po wyłączeniu ekranu."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Wygaszanie ekranu"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Ze względów bezpieczeństwa ustaw wzór"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Podaj ponownie hasło"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Podaj hasło profilu do pracy"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potwierdź wzór"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Podaj wzór profilu do pracy"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Podaj ponownie kod PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Podaj kod PIN profilu do pracy"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Hasła nie są takie same"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Kody PIN nie są takie same"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Narysuj wzór ponownie"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Czytnik ekranu przeznaczony głównie dla osób niewidomych i słabowidzących"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Klikaj elementy na ekranie, by posłuchać ich nazw czytanych na głos"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Powiększenie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Obszar powiększenia"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Pokaż kontroler ruchu"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Pokaż przypominający joystick kontroler, aby zmienić obszar powiększenia"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Ustawienia powiększenia"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Powiększanie skrótem i trzykrotnym kliknięciem"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Informacje o powiększeniu"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opcje"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Powiększenie na ekranie"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Kliknij trzy razy, by powiększyć"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Kliknij przycisk, by powiększyć"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Wybierz kartę SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Pomarańczowy"</string>
     <string name="color_purple" msgid="6603701972079904843">"Fioletowy"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Różowy"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Brak włożonych kart SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Stan karty SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stan karty SIM (gniazdo SIM %1$d)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="one">Włączono 1</item>
     </plurals>
     <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 istotnych aplikacji"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograniczanie powiadomień"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Włącz tryb Nie przeszkadzać"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Wyjątki"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuj wyświetlanie"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Zezwól na sygnały wizualne"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Po włączeniu trybu Nie przeszkadzać"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Zezwól na powiadomienia dźwiękowe"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ogranicz powiadomienia"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brak dźwięku powiadomień"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Nie zobaczysz powiadomień na ekranie"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Wycisz urządzenie, ale zezwól na wyjątki"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Wyjątki"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Harmonogram"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Zobacz wszystkie wyjątki"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Wyjątki po włączeniu trybu Nie przeszkadzać"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Osoby"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacje"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmy i inne powiadomienia"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Harmonogramy"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Wyciszone powiadomienia"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Gdy włączysz tryb Nie przeszkadzać, sygnalizowanie dźwiękiem i wibracjami będzie wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Wycisz wszystko oprócz:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Wyciszone"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Rozmowy"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Zezwalaj na wiadomości"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Aby mieć pewność, że dopuszczone wiadomości będą sygnalizowane dźwiękowo, sprawdź, czy urządzenie ma włączony dzwonek, a nie jest ustawione na wibracje ani wyciszone."</string>
     <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>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Żadne"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Nie zezwalaj na połączenia"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Nie zezwalaj na wiadomości"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Zezwól na alarmy"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmy"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Liczniki czasu, alarmy, systemy zabezpieczeń i inne aplikacje"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmy"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Odtwarzaj dźwięki multimediów"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Dźwięki multimediów"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Filmy, gry i inne multimedia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multimedia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Zezwól na dźwięki przy dotknięciu"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Dźwięki przy dotknięciu"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Klawiatura i inne przyciski"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"dźwięki przy dotknięciu"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Zezwól na przypomnienia"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Przypomnienia"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Zadania i przypomnienia"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"przypomnienia"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Zezwól na wydarzenia"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Wydarzenia"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Nadchodzące wydarzenia w kalendarzu"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Zezwól na zastępowanie przez aplikacje"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Aplikacje stanowiące wyjątek"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Wyświetlanie nad innymi aplikacjami"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Pozwól na wyświetlanie nad innymi aplikacjami"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Pozwala aplikacji na wyświetlanie się nad innymi aplikacjami, których właśnie używasz. Może zakłócać korzystanie z innych aplikacji oraz wpływać na ich wygląd lub sposób działania."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Dostęp do wszystkich plików"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Zezwól na zarządzanie wszystkimi plikami"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Zezwól tej aplikacji na odczytywanie, modyfikowanie i usuwanie plików na tym urządzeniu oraz wszelkich połączonych woluminach przechowywania. Aplikacje z tymi uprawnieniami mogą korzystać z dostępu do plików bez konieczności wyraźnego informowania Cię o tym."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Ma dostęp do wszystkich plików"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr rzeczywistość wirtualna odbiornik stereo usługa pomocnicza"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Wyświetlanie nad innymi"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Aplikacje, które mogą wyświetlać się nad innymi: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d0bbc4d..45c1012 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Desativada pelo administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponível"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status da segurança"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sempre exigir etapa de confirmação ao usar desbloqueio facial em apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Excluir info facial"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueio facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se ele for direcionado para seu rosto enquanto seus olhos estiverem abertos.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone pode ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com seus olhos fechados.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Excluir dados faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados de rosto usados pelo desbloqueio facial serão excluídos permanentemente e de maneira segura. Depois da remoção, você precisará do PIN, padrão ou senha para desbloquear o smartphone, fazer login em apps e confirmar pagamentos."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidade anônima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Senha"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador de senha SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar senha"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Selecionar banda do ponto de acesso"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automático"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartilhando o Wi‑Fi com este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Compartilhar ponto de acesso"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirme sua identidade"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Confirmar sua identidade"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca será desativado automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Será desativado automaticamente ao amanhecer"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"O tema escuro usa o preto absoluto para aumentar a duração da bateria. O tema escuro espera para ser ativado até que sua tela esteja desligada."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"O tema escuro usa um plano de fundo preto para aumentar a duração da bateria em algumas telas. Ele é ativado apenas depois que a tela é desligada."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo limite da tela"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por segurança, defina um padrão"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Digite sua senha novamente"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Digite sua senha de trabalho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirme seu padrão"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Informe seu padrão de trabalho"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Digite seu PIN novamente"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Digite seu PIN de trabalho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Os PINs não correspondem"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Desenhe seu padrão novamente"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tocar nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Ampliar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar controle para mover"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostrar um controle do tipo joystick para mover a área de ampliação"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Configurações de ampliação"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ampliar com atalho e toque triplo"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Sobre o \"Ampliar\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opções"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Aumentar o zoom na tela"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tocar três vezes para ampliar"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toque em um botão para aplicar zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selecionar chip"</string>
     <string name="color_orange" msgid="216547825489739010">"Laranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Roxo"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nenhum chip inserido"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status do chip"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status do chip (slot para SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ativadas</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o \"Não perturbe\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceções"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quando o Não perturbe estiver ativado"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitem sons"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringir notificações"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Desativar som de notificações"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Você verá as notificações na sua tela"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Desativar sons do dispositivo, mas permitir exceções"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceções"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programação"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ver todas as exceções"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceções quando o \"Não perturbe\" está ativado"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes e outras interrupções"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programações"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificações silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Quando o Não perturbe estiver ativado, sons e vibrações serão desativados, com exceção dos itens permitidos por você acima."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Desativar todos os sons, exceto"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Som desativado"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversas"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensagens"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para garantir que as mensagens permitidas emitam sons, verifique se o dispositivo está configurado para tocar, vibrar ou no silencioso."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nenhum"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Não permitir chamadas"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Não permitir mensagens"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De timers, alarmes, sistemas de segurança e outros apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproduzir sons de mídia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons de mídia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, jogos e outras mídias"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"mídia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir sons de toque"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons de toque"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Do seu teclado e outros botões"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons de toque"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir lembretes"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Lembretes"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tarefas e lembretes"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"lembretes"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De eventos futuros da agenda"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que apps modifiquem o \"Não perturbe\""</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Exceções de apps"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Sobrepor a outros apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir sobreposição a outros apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acesso a todos os arquivos"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Acesso para gerenciar todos os arquivos"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permitir que o app leia, modifique e exclua todos os arquivos deste dispositivo ou de qualquer volume de armazenamento conectado. Se a permissão for concedida, o app poderá acessar arquivos sem nenhum aviso prévio."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pode acessar todos os arquivos"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outros apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5285e8c..c33f356 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Desativada pelo gestor"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Não disponível."</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estado de segurança"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de ecrã, Desbloqueio Através do Rosto"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de ecrã, impressão digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ao utilizar Desbl. Através Rosto em apl., solicitar sempre confirmação"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Elim. dados faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configure o Desbloqueio através do rosto"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Utilize o Desbloqueio Através do Rosto para desbloquear o dispositivo, iniciar sessão em aplicações e confirmar pagamentos.\n\nTenha em atenção:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto com os olhos abertos.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilize o Desbloqueio através do rosto para desbloquear o dispositivo, iniciar sessão em apps e confirmar pagamentos.\n\nTenha em atenção:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilize o Desbloqueio através do rosto para desbloquear o dispositivo, iniciar sessão em aplicações e confirmar pagamentos.\n\nTenha em atenção:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto, mesmo com os olhos fechados.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eliminar os dados do rosto?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados do rosto utilizados pelo Desbloqueio através do rosto serão eliminados permanentemente e em segurança. Após a remoção, precisará do PIN, do padrão ou da palavra-passe para desbloquear o telemóvel, iniciar sessão nas aplicações e confirmar pagamentos."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidade anónima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Palavra-passe"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador palavra-passe SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar palavra-passe"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Selecionar banda do PA"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automático"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"A partilhar o Wi‑Fi com este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"A ligar…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partilhar zona Wi-Fi"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirme a sua identidade"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Valide a sua identidade"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desativa automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Desativa-se automaticamente ao nascer do sol"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"O tema escuro utiliza o preto real para ajudar a prolongar a duração da bateria. Os horários do tema escuro só são ativados quando o ecrã está desligado."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"O tema escuro utiliza um fundo preto para ajudar a prolongar a duração da bateria em alguns ecrãs. Os horários do tema escuro só são ativados quando o ecrã está desligado."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Limite de tempo do ecrã"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Defina PIN para usar impressão digital"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por motivos de segurança, defina um padrão."</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Reintroduzir a palavra-passe"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Introduza a palavra-passe de trabalho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirmar o padrão"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Introduza o padrão de trabalho"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Reintroduza o PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Introduza o PIN de trabalho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"As palavras-passe não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Os PINs não correspondem"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Desenhe o padrão novamente"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Leitor de ecrã principalmente para pessoas invisuais ou com visão reduzida"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toque nos itens no ecrã para que sejam lidos em voz alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Ampliar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar controlador de movimento"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostrar um controlador tipo joystick para mover a área de ampliação"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Definições de ampliação"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Amplie com um atalho e três toques"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Acerca da Ampliação"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opções"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Aumentar zoom no ecrã"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tocar três vezes para aumentar/diminuir o zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tocar num botão para utilizar o zoom"</string>
@@ -2078,7 +2084,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_with_talkback" msgid="7405718459133831431">"Para ativar ou desativar este serviço, deslize rapidamente com três dedos para cima a partir da parte inferior do ecrã.\n\nPara alternar entre serviços, deslize rapidamente com três dedos para cima sem soltar."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_without_talkback" msgid="8744979550867005938">"Para ativar ou desativar um serviço de acessibilidade, deslize rapidamente com dois dedos para cima a partir da parte inferior do ecrã.\n\nPara alternar entre serviços, deslize rapidamente com dois dedos para cima sem soltar."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_with_talkback" msgid="9124610711696596426">"Para ativar ou desativar um serviço de acessibilidade, deslize rapidamente com três dedos para cima a partir da parte inferior do ecrã.\n\nPara alternar entre serviços, deslize rapidamente com três dedos para cima sem soltar."</string>
-    <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"Compreendi"</string>
+    <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
     <string name="accessibility_shortcut_title" msgid="7219851818023989864">"Utilize o atalho para abrir"</string>
     <string name="accessibility_magnification_shortcut_title" msgid="3850925633238639131">"Utilize o atalho para ampliar"</string>
     <string name="accessibility_shortcut_edit_dialog_title" msgid="4922086411442295974">"Atalho para abrir <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
@@ -2999,7 +3005,7 @@
     <string name="nfc_payment_pay_with" msgid="10107565447713526">"Num terminal Tocar e pagar, pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"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">"Compreendi"</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_payment_set_default_label" msgid="9046299254316590677">"Definir como preferência?"</string>
     <string name="nfc_payment_set_default" msgid="499518459418302061">"Pretende utilizar sempre <xliff:g id="APP">%1$s</xliff:g> com a funcionalidade Tocar e pagar?"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selecionar cartão SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Cor de laranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Roxo"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nenhum cartão SIM inserido"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Estado do SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Estado do SIM (ranhura para SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 ativado.</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o modo Não incomodar"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceções"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quando o modo Não incomodar está ativado"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitam som"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringir notificações"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Sem som de notificações"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Vê as notificações no ecrã."</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Desativar som do dispositivo, mas permitir exceções"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceções"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Horário"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ver todas as exceções"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceções quando o modo Não incomodar está ativado"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes e outras interrupções"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Horários"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificações silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Quando o modo Não incomodar está ativo, o som e a vibração são desativados, exceto para os itens que permitir acima."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Desativar tudo exceto"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Desativados"</string>
@@ -3346,7 +3356,7 @@
     <string name="zen_sound_three_allowed" msgid="3770279281597307824">"Desativado, mas permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Definições personalizadas"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Rever horário"</string>
-    <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Compreendi"</string>
+    <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notificações"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duração"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Mensagens, eventos e lembretes"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversas"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensagens"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para se certificar de que as mensagens permitidas emitem som, verifique se o dispositivo está definido para tocar, para vibrar ou para o modo silencioso."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nenhuma"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Não permitir quaisquer chamadas"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Não permitir quaisquer mensagens"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De temporizadores, alarmes, sistemas de segurança e outras apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproduzir sons multimédia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons multimédia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, jogos e outro conteúdo multimédia"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"multimédia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir sons de toque"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons de toque"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Do teclado e outros botões"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons de toque"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir lembretes"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Lembretes"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tarefas e lembretes"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"lembretes"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De eventos futuros do calendário"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que as aplicações substituam"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Exceções de aplicações"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Sobrepor a outras aplicações"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir sobreposição a outras aplicações"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permita que esta aplicação se sobreponha a outras aplicações que esteja a utilizar. Pode interferir com a sua utilização dessas aplicações ou alterar a forma como estas aparecem ou se comportam."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acesso a todos os ficheiros"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Permitir acesso para gerir todos os ficheiros"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permita que esta app leia, modifique e elimine todos os ficheiros neste dispositivo ou em qualquer volume de armazenamento ligado. Se a autorização for concedida, a app poderá aceder aos ficheiros sem o seu conhecimento explícito."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pode aceder a todos os ficheiros"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual serviço de escuta estéreo serviço assistente"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outras aplicações"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicações autorizadas a sobreporem-se a outras aplicações"</string>
@@ -4179,7 +4199,7 @@
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ativado/Temporariamente desativado devido à Poupança de bateria"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporariamente ativado devido à Poupança de bateria"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"As aplicações suportadas também mudam para o tema escuro"</string>
-    <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Compreendi"</string>
+    <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Experimente o tema escuro"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Ajuda a aumentar a autonomia da bateria."</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Mosaicos de definições rápidas do programador"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d0bbc4d..45c1012 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Desativada pelo administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponível"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status da segurança"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sempre exigir etapa de confirmação ao usar desbloqueio facial em apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Excluir info facial"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueio facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se ele for direcionado para seu rosto enquanto seus olhos estiverem abertos.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone pode ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com seus olhos fechados.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Excluir dados faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados de rosto usados pelo desbloqueio facial serão excluídos permanentemente e de maneira segura. Depois da remoção, você precisará do PIN, padrão ou senha para desbloquear o smartphone, fazer login em apps e confirmar pagamentos."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identidade anônima"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Senha"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificador de senha SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Mostrar senha"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Selecionar banda do ponto de acesso"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automático"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartilhando o Wi‑Fi com este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Compartilhar ponto de acesso"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirme sua identidade"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Confirmar sua identidade"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca será desativado automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Será desativado automaticamente ao amanhecer"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"O tema escuro usa o preto absoluto para aumentar a duração da bateria. O tema escuro espera para ser ativado até que sua tela esteja desligada."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"O tema escuro usa um plano de fundo preto para aumentar a duração da bateria em algumas telas. Ele é ativado apenas depois que a tela é desligada."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Tempo limite da tela"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Por segurança, defina um padrão"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Digite sua senha novamente"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Digite sua senha de trabalho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirme seu padrão"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Informe seu padrão de trabalho"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Digite seu PIN novamente"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Digite seu PIN de trabalho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Os PINs não correspondem"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Desenhe seu padrão novamente"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tocar nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Ampliar"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Mostrar controle para mover"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Mostrar um controle do tipo joystick para mover a área de ampliação"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Configurações de ampliação"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Ampliar com atalho e toque triplo"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Sobre o \"Ampliar\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opções"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Aumentar o zoom na tela"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tocar três vezes para ampliar"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toque em um botão para aplicar zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selecionar chip"</string>
     <string name="color_orange" msgid="216547825489739010">"Laranja"</string>
     <string name="color_purple" msgid="6603701972079904843">"Roxo"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nenhum chip inserido"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status do chip"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status do chip (slot para SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ativadas</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o \"Não perturbe\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Exceções"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Quando o Não perturbe estiver ativado"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitem sons"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restringir notificações"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Desativar som de notificações"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Você verá as notificações na sua tela"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Desativar sons do dispositivo, mas permitir exceções"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Exceções"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Programação"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Ver todas as exceções"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Exceções quando o \"Não perturbe\" está ativado"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes e outras interrupções"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programações"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificações silenciadas"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Quando o Não perturbe estiver ativado, sons e vibrações serão desativados, com exceção dos itens permitidos por você acima."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Desativar todos os sons, exceto"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Som desativado"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversas"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permitir mensagens"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para garantir que as mensagens permitidas emitam sons, verifique se o dispositivo está configurado para tocar, vibrar ou no silencioso."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nenhum"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Não permitir chamadas"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Não permitir mensagens"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permitir alarmes"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De timers, alarmes, sistemas de segurança e outros apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmes"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Reproduzir sons de mídia"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sons de mídia"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De vídeos, jogos e outras mídias"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"mídia"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permitir sons de toque"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sons de toque"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Do seu teclado e outros botões"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sons de toque"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permitir lembretes"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Lembretes"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De tarefas e lembretes"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"lembretes"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permitir eventos"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Eventos"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De eventos futuros da agenda"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permitir que apps modifiquem o \"Não perturbe\""</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Exceções de apps"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Sobrepor a outros apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permitir sobreposição a outros apps"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acesso a todos os arquivos"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Acesso para gerenciar todos os arquivos"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permitir que o app leia, modifique e exclua todos os arquivos deste dispositivo ou de qualquer volume de armazenamento conectado. Se a permissão for concedida, o app poderá acessar arquivos sem nenhum aviso prévio."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Pode acessar todos os arquivos"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outros apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9b5c4f1..af32cbd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Confidențialitate"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Dezactivat de administrator"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponibil"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Starea de securitate"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocarea ecranului, deblocare facială"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocarea ecranului, amprentă"</string>
@@ -374,7 +374,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Când folosiți deblocarea facială în aplicații, solicitați întotdeauna confirmarea"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ștergeți datele faciale"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurați deblocarea facială"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți.\n\nRețineți:\ndacă vă uitați la telefon, îl puteți debloca când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs., când aveți ochii deschiși.\n\nTelefonul poate fi deblocat de cineva are seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți.\n\nRețineți:\ndacă priviți spre telefon, îl puteți debloca și când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs.\n\nTelefonul poate fi deblocat de cineva care seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți.\n\nRețineți:\ndacă vă uitați la telefon, îl puteți debloca când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs., chiar dacă aveți ochii închiși.\n\nTelefonul poate fi deblocat de cineva are seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ștergeți datele faciale?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Datele faciale folosite de deblocarea facială vor fi șterse definitiv și în siguranță. După eliminare, veți avea nevoie de codul PIN, de model sau de parolă ca să deblocați telefonul, să vă conectați la aplicații și să confirmați plățile."</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitate"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identitate anonimă"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Parolă"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identificatorul de parole SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Afișați parola"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Selectați banda AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automat"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Se permite accesul la Wi-Fi pentru acest dispozitiv…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Se conectează…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Permiteți accesul la hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Confirmați că sunteți dvs."</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Confirmați-vă identitatea"</string>
     <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" 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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activată/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nu se va dezactiva niciodată automat"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se va dezactiva automat la răsărit"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tema întunecată folosește negru real pentru a conserva autonomia bateriei. Programele cu Tema întunecată se activează când se dezactivează ecranul."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tema întunecată folosește un fundal negru pentru a conserva autonomia bateriei pentru unele ecrane. Programele cu Tema întunecată se activează când se dezactivează ecranul."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Durată până la dezactivarea ecranului"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Pentru a utiliza amprenta, setați codul PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Din motive de securitate, setați un model"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Reintroduceți parola"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Introduceți parola de la serviciu"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Confirmați modelul"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Introduceți modelul pentru serviciu"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Reintroduceți codul PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Introduceți codul PIN pentru serviciu"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Parolele nu corespund"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Codurile PIN nu corespund"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Desenați modelul din nou"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Cititor de ecran destinat în principal utilizatorilor nevăzători și cu deficiențe de vedere"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Atingeți elementele de pe ecran pentru a le auzi cititte cu voce tare"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Măriți"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona de mărire"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Afișați controlerul pentru mutare"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Afișați un controler asemănător unui joystick pentru a muta zona de mărire"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Setările pentru mărire"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Măriți folosind scurtătura și atingând de trei ori"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Despre Măriți"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opțiuni"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Măriți pe ecran"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Atingeți de 3 ori pentru zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Atingeți un buton pentru a micșora/mări"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Selectați cardul SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Portocaliu"</string>
     <string name="color_purple" msgid="6603701972079904843">"Violet"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Roz"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nu a fost introdus niciun card SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Starea cardului SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stare card SIM (slot pentru SIM %1$d)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="one">O regulă activată</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activați Nu deranja"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Excepții"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blocați întreruperile vizuale"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permiteți semnale vizuale"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Când funcția „Nu deranja” este activată"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Permiteți întreruperile care emit sunete"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Restricționați notificările"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Fără sunet de la notificări"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Veți vedea notificările pe ecran"</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Dezactivați sunetul dispozitivului, dar permiteți excepții"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Excepții"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Program"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Vedeți toate excepțiile"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Excepții: când funcția „Nu deranja” este activată"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Persoane"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplicații"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarme și alte întreruperi"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programe"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Notificări dezactivate"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Când este activată funcția Nu deranja, sunetele și vibrațiile vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Dezactivați sunetul pentru toate, cu excepția"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Sunet dezactivat"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Conversații"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Permiteți mesaje"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Pentru a vă asigura că mesajele permise emit sunete, verificați dacă dispozitivul este setat să sune, să vibreze sau este în modul silențios."</string>
     <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>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Niciunul"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Nu permiteți niciun apel"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Nu permiteți mesaje"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Permiteți alarme"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarme"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"De la temporizatoare, alarme, sisteme de securitate și alte aplicații"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarme"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Redați sunete media"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sunete media"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"De la videoclipuri, jocuri și alte fișiere media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Permiteți sunetele de atingere"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sunete la atingere"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"De la tastatură și alte butoane"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sunete la atingere"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Permiteți mementouri"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Mementouri"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"De la sarcini și mementouri"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"mementouri"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Permiteți evenimente"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Evenimente"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"De la evenimentele viitoare din calendar"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Permiteți aplicațiilor să ignore"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Excepțiile aplicației"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Afișare peste alte aplicații"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Permiteți afișarea peste alte aplicații"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Permiteți acestei aplicații să se afișeze peste alte aplicații pe care le folosiți. Aceasta poate interfera cu folosirea acelor aplicații sau poate schimba modul în care acestea apar sau se comportă."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Acces la toate fișierele"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Permiteți gestionarea fișierelor"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Permiteți aplicației să citească, să modifice și să șteargă toate fișierele de pe dispozitiv sau din spațiile de stocare conectate. Dacă îi permiteți, aplicația poate accesa fișierele fără consimțământul dvs. explicit."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Poate accesa toate fișierele"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"rv realitate virtuală instrument de ascultare stereo serviciu de ajutor"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Afișare peste alte aplicații"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> din <xliff:g id="COUNT_1">%2$d</xliff:g> aplicații au voie să afișeze peste alte aplicații"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b3fa582..ab11f57 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Конфиденциальность"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Отключено администратором"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Недоступно"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Статус защиты"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокировка экрана, Фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокировка экрана, отпечаток пальца"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Всегда запрашивать подтверждение фейсконтроля в приложениях"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Удалить данные"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Настройте фейсконтроль"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Используйте фейсконтроль, чтобы разблокировать устройство, входить в приложения и подтверждать платежи.\n\nОбратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу, когда у вас открыты глаза.\n\nТелефон может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Используйте фейсконтроль, чтобы снимать блокировку устройства, входить в приложения и подтверждать платежи.\n\nОбратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу.\n\nТелефон может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Используйте фейсконтроль, чтобы разблокировать устройство, входить в приложения и подтверждать платежи.\n\nОбратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу, даже когда у вас закрыты глаза.\n\nТелефон может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Удалить данные?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Данные, которые используются фейсконтролем для распознавания, будут удалены навсегда и нигде не сохранятся. В дальнейшем для разблокировки телефона, входа в приложения и подтверждения платежей устройство будет запрашивать PIN-код, пароль или графический ключ."</string>
@@ -808,8 +808,8 @@
     <string name="show_refresh_rate" msgid="5742688821872354973">"Частота обновления"</string>
     <string name="show_refresh_rate_summary" msgid="3558118122374609663">"Показывать текущую частоту обновления экрана"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"Разрешить обмен данными, когда вы подносите планшет к NFC-устройству"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"Разрешить обмен данными, когда вы подносите телефон к NFC-устройству"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"Разрешить обмен данными, когда планшет находится рядом с NFC-устройством"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"Разрешить обмен данными, когда телефон находится рядом с NFC-устройством"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"Включите NFC"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"Связь малого радиуса действия (NFC) позволяет обмениваться данными с другими устройствами поблизости, например кассовыми терминалами, устройствами доступа, интерактивной рекламой и метками."</string>
     <string name="nfc_secure_settings_title" msgid="8947380729696717356">"Безопасное использование NFC"</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Пользователь"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Неизвестный"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Пароль"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Идентификатор пароля SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Показать пароль"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Диапазон частот Wi-Fi"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Авто"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Предоставление доступа к сети Wi‑Fi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Подключение…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Поделиться точкой доступа"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Подтвердите, что это вы"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Подтвердите, что это вы"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Не выключится автоматически"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Выключится автоматически на рассвете"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"В тёмной теме используется черный цвет без полутонов. Это помогает продлить срок работы батареи вашего устройства. Кроме того, вы можете указать, когда тёмная тема должна включаться и отключаться."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"В тёмной теме используется черный фон. Это помогает продлить срок работы батареи некоторых устройств. Если вы работаете с телефоном в тот момент, когда по расписанию должна активироваться тёмная тема, она будет применена только после следующего включения экрана."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Время отключения экрана"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Отключение экрана"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Задайте PIN-код"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Задайте графический ключ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Введите пароль ещё раз"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Введите пароль рабочего профиля"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Подтвердите графический ключ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Введите граф. ключ рабочего профиля"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Введите PIN-код ещё раз"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Введите PIN-код рабочего профиля"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Пароли не совпадают"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-коды не совпадают"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Начертите графический ключ ещё раз"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Инструмент для озвучивания данных с экрана для людей с нарушениями зрения"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Чтобы услышать описание элемента, нажмите на него"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Настройки субтитров"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увеличение"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Увеличение"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область увеличения"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Показывать контроллер движения"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Для изменения области увеличения использовать контроллер, похожий на джойстик"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Настройки увеличения"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Увеличение с помощью кнопки и по тройному нажатию"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"О функции увеличения"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Параметры"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Экранная лупа"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Изменение масштаба тремя нажатиями"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Чтобы увеличить масштаб, нажмите кнопку"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Выберите SIM-карту"</string>
     <string name="color_orange" msgid="216547825489739010">"Оранжевый"</string>
     <string name="color_purple" msgid="6603701972079904843">"Фиолетовый"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Розовый"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM-карта не вставлена"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Статус SIM-карты"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Статус SIM (слот SIM %1$d)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="other">Включено <xliff:g id="ON_COUNT">%d</xliff:g> расписания.</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Включите режим \"Не беспокоить\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Исключения"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокировка визуального оповещения"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Включить визуальное оповещение"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"В режиме \"Не беспокоить\""</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Разрешить звуковые уведомления"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ограничение уведомлений"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Отключить звук уведомлений"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Уведомления будут показываться на экране"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Без звука (кроме исключений)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Исключения"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Расписание"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Все исключения"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Исключения в режиме \"Не беспокоить\""</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_schedule" msgid="2003707171924226212">"Расписания"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Отключенные уведомления"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"В режиме \"Не беспокоить\" будут отключены звук и вибрация, за исключением случаев, для которых вы настроите разрешения выше."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Все без звука, кроме"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Без звука"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Чаты"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Сообщения"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Чтобы не пропустить важные сообщения, убедитесь, что на устройстве включен звук или вибрация."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Когда действует правило \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", входящие сообщения блокируются. Вы можете изменить настройки, чтобы принимать сообщения от друзей, членов семьи и других контактов."</string>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ни от кого"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Запретить все звонки"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Запретить все сообщения"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Сигналы будильника"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Будильник"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Таймеры, будильники, системы обеспечения безопасности и другие приложения"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"будильники"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Звуки мультимедиа"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Звуки мультимедиа"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Видео, игры и другие медиафайлы"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"мультимедиа"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Звук нажатия на экран"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Звук нажатия на экран"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Клавиатура и кнопки"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"звук нажатия на экран"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Напоминания"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Напоминания"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Задачи и напоминания"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"напоминания"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Уведомления о мероприятиях"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Мероприятия"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Предстоящие мероприятия в календаре"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешить приложениям переопределять \"Не беспокоить\""</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Исключения для приложений"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Поверх других приложений"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Показывать поверх других приложений"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Элементы интерфейса будут отображаться поверх других окон. Это может мешать вашей работе с приложениями или искажать их интерфейс."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Доступ ко всем файлам"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Разрешить доступ к управлению всеми файлами"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Разрешает приложению просматривать, изменять и удалять все файлы на этом устройстве и на подключенных устройствах внешней памяти. Если вы предоставите это разрешение, приложение сможет получать доступ к файлам без вашего ведома."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Приложения, имеющие доступ ко всем файлам"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуальная реальность режим вспомогательный сервис"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Поверх других приложений"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> из <xliff:g id="COUNT_1">%2$d</xliff:g> приложений отображаются поверх других окон"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 8e69745..d606dc0 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"රහස්‍යතාව"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ලබා ගත නොහැකිය"</string>
     <string name="security_status_title" msgid="6958004275337618656">"ආරක්ෂක තත්ත්වය"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"තිර අගුල, මුහුණු අගුලු හැරීම"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"තිර අගුල, ඇඟිලි සලකුණ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"යෙදුම් තුළ මුහුණු අඟුලු ඇරීම භාවිත කරන විට, සැම විටම තහවුරු කිරීමේ පියවර අවශ්‍ය කරන්න"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"මුහුණු දත්ත මකන්න"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"මුහුණු අඟුලු ඇරීම සකසන්න"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ඔබේ උපාංගය අඟුලු ඇරීමට, යෙදුම්වලට පුරන්නට, සහ ගෙවීම් තහවුරු කිරීමට මුහුණු අඟුලු ඇරීම භාවිත කරන්න.\n\nමතක තබා ගන්න:\n\n\nඔබේ දුරකථනය එය ඔබේ ඇස් ඇර තිබියදී ඔබේ මුහුණ ළඟ අල්ලා ගනු ලබන්නේ නම් වෙනත් කෙනෙකු විසින් අඟුලු අරිනු ලැබිය හැක.\n\nබොහෝ දුරට ඔබට සමානව පෙනෙන, සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකුගෙන් අඟුලු අරිනු ලැබීමට ඉඩ ඇත."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ඔබේ උපාංගය අගුලු ඇරීමට, යෙදුම්වලට පිරීමට සහ ගෙවීම් තහවුරු කිරීමට මුහුණෙන් අගුලු ඇරීම භාවිත කරන්න.\n\nමතක තබා ගන්න:\nදුරකථනය දෙස බැලීම ඔබ අදහස් නොකරන විට එය අගුලු ඇරිය හැකිය.\n\nඔබේ දුරකථනය එය ඔබේ මුහුණ දක්වා ඔසවන්නේ නම් වෙනයම් කෙනෙකු විසින් අගුලු ඇරිය හැකිය.\n\nඔබේ දුරකථනය බොහෝ දුරට ඔබ මෙන් පෙනෙන, එනම් සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු ඇරිය හැකිය."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ඔබේ උපාංගය අගුලු හැරීමට, යෙදුම්වලට පිරීමට, සහ ගෙවීම් තහවුරු කිරීමට මුහුණෙන් අගුලු ඇරීම භාවිත කරන්න.\n\nමතක තබා ගන්න:\n\n\nඔබේ දුරකථනය ඔබේ ඇස් වසා තිබියදී පවා ඔබේ මුහුණට සමීපව අල්ලා ගනු ලබන්නේ නම් වෙනත් කෙනෙකු විසින් එහි අගුලු හරිනු ලැබිය හැකිය.\n\nබොහෝ දුරට ඔබට සමානව පෙනෙන, සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු හරිනු ලැබීමට ඉඩ ඇත."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"මුහුණු දත්ත මකන්නේද?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"මුහුණෙන් අගුලු හැරීම මගින් භාවිත කරන මුහුණු දත්ත ස්ථීරව සහ ආරක්ෂිතව මැකෙනු ඇත. ඉවත් කළ පසු, ඔබේ දුරකථනය අගුලු හැරීමට, යෙදුම්වලට පිරීමට, සහ ගෙවීම් තහවුරු කිරීමට ඔබට ඔබේ PIN අංකය, රටාව, හෝ මුරපදය අවශ්‍යයි."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"අනන්‍යතාවය"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"නොදන්නා අනන්‍යතාව"</string>
     <string name="wifi_password" msgid="1458802324849513755">"මුරපදය"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE මුරපද අනන්‍යකාරකය"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"මුරපදය පෙන්වන්න"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP කලාපය තෝරන්න"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ස්වයං"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"මෙම උපාංගය සමඟ Wi‑Fi බෙදා ගනිමින්…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"සබැඳෙමින්…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"හොට්ස්පොට් බෙදා ගන්න"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ඒ ඔබ බව සත්‍යාපන කරන්න"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ඒ ඔබ බව සත්‍යාපනය කරන්න"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"අඳුරු තේමාව ඔබේ බැටරිය දිගු කාලයක් පවත්වා ගැනීමට සැබෑ කලු භාවිත කරයි. අඳුරු තේමා කාල සටහන් ක්‍රියාත්මක වීමට ඔබගේ තිරය ක්‍රියාවිරහිත වන තෙක් රැඳී සිටී."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"අඳුරු තේමාව ඔබේ බැටරිය සමහර තිරවල දිගු කාලයක් පවත්වා ගැනීම සඳහා සහාය වීමට කලු පසුබිමක් භාවිත කරයි. අඳුරු තේමා කාල සටහන් ක්‍රියාත්මක වීමට ඔබගේ තිරය ක්‍රියාවිරහිත වන තෙක් රැඳී සිටී."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"තිර කල් ඉකුත්වීම"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"තිරය අක්‍රිය කරන්න"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"ආරක්ෂාව සඳහා, රටාව සකසන්න"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ඔබගේ මුරපදය නැවතත් ඇතුළු කරන්න"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ඔබේ කාර්යාල මුරපදය ඇතුළු කරන්න"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ඔබගේ රටාව තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ඔබේ වැඩ රටාව ඇතුළු කරන්න"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ඔබගේ PIN අංකය නැවත ඇතුළු කරන්න"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ඔබේ කාර්යාල PIN ඇතුළු කරන්න"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"මුරපද නොගැලපේ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN නොගැලපේ"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ඔබේ රටාව නැවත අඳින්න"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"තිර කියවනය මූලික වශයෙන් අන්ධ සහ අඩු දෘශ්‍යතාව සහිත පුද්ගලයන් සඳහාය"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"හඬ නඟා කියවීමට සවන් දීම සඳහා ඔබේ තිරය මත අයිතම තට්ටු කරන්න"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"සිරස්තල මනාප"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"විශාලනය"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"විශාලනය කරන්න"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"විශාලනය කිරීමේ ප්‍රදේශය"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"ගෙන යාමේ පාලකය පෙන්වන්න"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"විශාලනය කිරීමේ ප්‍රදේශය ගෙන යාමට නියාමක යටියක් වැනි පාලකයක් පෙන්වන්න"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"සැකසීම් විශාලනය කරන්න"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"කෙටිමඟ සහ තට්ටු කිරීම් තුනක් සමඟ විශාලන කරන්න"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Magnify පිළිබඳ"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"විකල්ප"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"තිරය මත විශාලනය කරන්න"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"විශාලනය කිරීමට 3 වරක් තට්ටු කරන්න"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"විශාලනය කිරීමට බොත්තමක් තට්ටු කරන්න"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM කාඩ්පත තෝරන්න"</string>
     <string name="color_orange" msgid="216547825489739010">"තැඹිලි"</string>
     <string name="color_purple" msgid="6603701972079904843">"දම්"</string>
+    <string name="color_pink" msgid="8596872110888626708">"රෝස"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM කාඩ්පත් ඇතුළත් කර නොමැත"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM තත්ත්වය"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM තත්ත්වය (sim විවරය %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>ක් සබලයි</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"බාධා නොකරන්න ක්‍රියාත්මක කරන්න"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ව්‍යතිරේක"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"දෘශ්‍ය බාධක අවහිර කරන්න"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"දෘශ්‍ය සංඥාවලට ඉඩ දෙන්න"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Do Not Disturb ක්‍රියාත්මක වන්නේ මොන වේලාවටද"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"ශබ්දය ඇති කරන බාධා කිරීම්වලට ඉඩ දෙන්න"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"දැනුම්දීම් සීමා කරන්න"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"ඔබ ඔබගේ තිරය මත දැනුම්දීම් දකිනු ඇත"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"උපාංගය නිහඬ කරන්න, නමුත් ව්‍යාතිරේක ඉඩ දෙන්න"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ව්‍යතිරේක"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"කාල සටහන"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"සියලු ව්‍යාතිරේක බලන්න"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"බාධා නොකරන්න ක්‍රියාත්මක විට ව්‍යතිරේක"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"පුද්ගලයන්"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"යෙදුම්"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"එලාම &amp; වෙනත් බාධා කිරීම්"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"කාල සටහන්"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"නිහඬ කළ දැනුම් දීම්"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"බාධා නොකරන්න ක්‍රියාත්මක විට, ඔබ විසින් අවසර දෙනු ලබන අයිතම සඳහා හැරුණු විට, ශබ්දය සහ කම්පනය නිහඬ වනු ඇත."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"හැර සියල්ල නිහඬ කරන්න"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"නිහඬයි"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"සංවාද"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"පණිවිඩ ඉඩ දෙන්න"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"අවසර දුන් පණිවුඩ ශබ්ද නැඟීම තහවුරු කිරීමට, ඔබේ උපාංගය නාද වීමට, කම්පා වීමට, හෝ නිහඬ වීමට සකසා තිබේදැයි පරීක්‍ෂා කරන්න."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ සඳහා එන පණිවිඩ අවහිර වේ. ඔබට ඔබේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ කරා ළඟා වීමට ඉඩ දීමට සැකසීම් සීරුමාරු කළ හැකිය."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"කිසිවක් නැත"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"කිසිදු ඇමතුමකට ඉඩ නොදෙන්න"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"කිසිදු පණිවිඩයකට ඉඩ නොදෙන්න"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"එලාම ඉඩ දෙන්න"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"ඇඟවීම්"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"කාල ගණක, එලාම, ආරක්ෂක පද්ධති සහ වෙනත් යෙදුම් වෙතින්"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"එලාම"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"මාධ්‍ය ශබ්ද වාදන කරන්න"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"මාධ්‍ය ශබ්ද"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"වීඩියෝ, ක්‍රීඩා සහ වෙනත් මාධ්‍ය වෙතින්"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"මාධ්‍ය"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ස්පර්ශ ශබ්දවලට ඉඩ දෙන්න"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ස්පර්ශ ශබ්ද"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"ඔබගේ යතුරුපුවරුව සහ වෙනත් බොත්තම් වෙතින්"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ස්පර්ශ ශබ්ද"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"සිහිකැඳවීම් ඉඩ දෙන්න"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"සිහිකැඳවීම්"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"කාර්ය සහ සිහිකැඳවීම් වෙතින්"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"සිහි කැඳවීම්"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"සිදුවීම් ඉඩ දෙන්න"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"සිදුවීම්"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"ඉදිරියට එන දින දර්ශන සිදුවීම් වෙතින්"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ප්‍රතික්ෂේප කිරිමට යෙදුම්වලට ඉඩ දෙන්න"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"යෙදුම් ව්‍යතිරේක"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"වෙනත් යෙදුම් උඩින් පෙන්වන්න"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"වෙනත් යෙදුම් උඩින් පෙන්වීමට අවසර දෙන්න"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"මෙම යෙදුමට ඔබ භාවිත කරන වෙනත් යෙදුම්වලට ඉහළින්ම සංදර්ශනය වීමට ඉඩ දෙන්න. එය ඔබේ එම යෙදුම් භාවිතය හෝ ඒවා පෙනෙන හෝ හැසිරෙන ආකාරය වෙත අවහිර කිරීමට හැකිය."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"සියලු ගොනු ප්‍රවේශය"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"සියලු ගොනු කළමනාකරණය කිරීමට ප්‍රවේශය ඉඩ දෙන්න"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"මෙම යෙදුමට මෙම උපාංගයේ හෝ ඕනෑම සබැඳුණු ගබඩා ධාරිතාවක ඇති සියලු ගොනු කියවීමට, වෙනස් කිරීමට සහ මැකීමට ඉඩ දෙන්න. ප්‍රදානය කළහොත්, ඔබේ ප්‍රකාශිත දැනුම රහිතව යෙදුමට ගොනු වෙත ප්‍රවේශ විය හැකිය."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"සියලු ගොනු වෙත ප්‍රවේශ විය හැකිය"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr අතථ්‍ය තථ්‍ය සවන් දෙන්නා ස්ටීරියෝ උදවුකරු සේවාව"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"වෙනත් යෙදුම් උඩින් පෙන්වන්න"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"යෙදුම් <xliff:g id="COUNT_1">%2$d</xliff:g>කින් <xliff:g id="COUNT_0">%1$d</xliff:g> කට වෙනත් යෙදුම් උඩින් පෙන්වන්න අවසර ඇත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d232d60..6b6561b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok úložiska poverení"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Ochrana súkromia"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Zakázané správcom"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nie je k dispozícii"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Stav zabezpečenia"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámka obrazovky, odomknutie tvárou"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámka obrazovky, odtlačok prsta"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Pri používaní odomknutia tvárou v aplikáciách požadovať potvrdenie"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Odstrániť údaje o tvári"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastaviť odomknutie tvárou"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Odomknutím tvárou môžete odomykať zariadenie, prihlasovať sa do aplikácií a potvrdzovať platby.\n\nDôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár a budete mať otvorené oči.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Odomknutím tvárou môžete odomykať zariadenie, prihlasovať sa do aplikácií a potvrdzovať platby.\n\nDôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Odomknutím tvárou môžete odomykať zariadenie, prihlasovať sa do aplikácií a potvrdzovať platby.\n\nDôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár, a to dokonca aj vtedy, keď budete mať zatvorené oči.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Chcete odstrániť údaje o tvári?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Údaje o tvári používané na odomknutie tvárou budú natrvalo a bezpečne odstránené. Po ich odstránení budete na odomykanie telefónu, prihlasovanie do aplikácií a potvrdzovanie platieb potrebovať svoj kód PIN, vzor alebo heslo."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identita"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymná identita"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Heslo"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikátor hesla SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Zobrazovať heslo"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Vybrať pásmo pre prístupový bod"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automaticky"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"S týmto zariadením sa zdieľa pripojenie Wi‑Fi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Pripája sa…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Zdieľať hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Ste to vy?"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Overenie vašej totožnosti"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikdy sa automaticky nevypne"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Vypne sa automaticky pri východe slnka"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tmavý motív používa skutočnú čiernu a predlžuje tak výdrž batérie. Plán tmavého motívu sa aktivuje, až keď sa vypne obrazovka."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tmavý motív na niektorých obrazovkách používa čierne pozadie a predlžuje tak výdrž batérie. Plány tmavého motívu sa zapnú až po vypnutí obrazovky."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Časový limit obrazovky"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Ak chcete použiť odtlačok prsta, nastavte PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Z bezpečnostných dôvodov si nastavte vzor"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Znova zadajte heslo"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Zadajte pracovné heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potvrďte svoj vzor"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Zadajte pracovný vzor"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Znova zadajte kód PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Zadajte pracovný kód PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Heslá sa nezhodujú"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Kódy PIN nie sú zhodné"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Znova nakreslite vzor"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Čítačka obrazovky je určená hlavne pre nevidiacich a slabozrakých ľudí"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Položky na obrazovke si môžete vypočuť nahlas klepnutím"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavenia titulkov"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Priblíženie"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Priblíženie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblasť zväčšenia"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Zobrazenie ovládača pohybu"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Zobrazí ovládač v tvare joysticku umožňujúci pohybovať oblasťou zväčšenia"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Nastavenia zväčšenia"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Priblíženie skratkou a trojitým klepnutím"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Priblíženie"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Možnosti"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Priblížte si obrazovku"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Na priblíženie trikrát klepnite"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Na priblíženie klepnite na tlačidlo"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Vybrať SIM kartu"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranžová"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purpurová"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Ružová"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nie sú vložené žiadne SIM karty"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Stav SIM karty"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stav SIM karty (%1$d. slot na SIM kartu)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="one">1 aktivovaný</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Režim bez vyrušení"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dostávajte upozornenia iba od relevantných ľudí a z dôležitých aplikácií"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Obmedzenie vyrušení"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Zapnite režim bez vyrušení"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Výnimky"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokovať vizuálne vyrušenia"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Povoliť vizuálne signály"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Keď je zapnutý režim bez vyrušení"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Povolenie zvukových vyrušení"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Obmedziť upozornenia"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Upozornenia bez zvuku"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Upozornenia bude vidieť na obrazovke"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Vypnúť zvuk zariadenia, ale povoliť výnimky"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Výnimky"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Plán"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Zobraziť všetky výnimky"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Výnimky, kedy je režime bez vyrušení zapnutý"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Ľudia"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikácie"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Budíky a iné vyrušenia"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Plány"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Stlmené upozornenia"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Keď je zapnutý režim bez vyrušení, zvuky a vibrácie budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Vypnúť všetky zvuky okrem"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Zvuk bol vypnutý"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Konverzácie"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Povoliť správy"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Ak chcete zaistiť, aby vaše zariadenie upozorňovalo na povolené správy zvukom, skontrolujte, či je v ňom nastavené zvonenie, vibrovanie alebo tichý režim."</string>
     <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>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Žiadne"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Nepovoliť žiadne hovory"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Nepovoliť žiadne správy"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Povoliť budíky"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Budíky"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Z časovačov, budíkov, bezpečnostných systémov a ďalších aplikácií"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"budíky"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Prehrávať zvuky médií"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvuky médií"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Z videí, hier a ďalších médií"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"médiá"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Povoliť zvuky klepnutí"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvuk pri klepnutí"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Z klávesnice a iných tlačidiel"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvuk pri klepnutí"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Povoliť pripomenutia"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Pripomenutia"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Z úloh a pripomenutí"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"pripomenutia"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Povoliť udalosti"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Udalosti"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Z nadchádzajúcich udalostí v kalendári"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Povoľte aplikáciám prekonávať nastavenia"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Výnimky aplikácie"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Zobrazenie cez iné aplikácie"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Povoliť zobrazenie nad ostatnými aplikáciami"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Umožní tejto aplikácii zobrazovať sa nad ostatnými aplikáciami, ktoré používate. Môže tak narušiť vašu prácu s týmito aplikáciami alebo zmeniť ich vzhľad či správanie."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Prístup k všetkým súborom"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Povoľte prístup na správu všetkých súborov"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Povoľte tejto aplikácii čítať, upravovať a odstraňovať všetky súbory v tomto zariadení alebo akýchkoľvek pripojených úložiskách. Po udelení tohto povolenia bude môcť aplikácia používať súbory bez vášho vedomia."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Má prístup k všetkým súborom"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuálna realita prijímač stereo pomocné zariadenie"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Zobrazenie cez iné aplikácie"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> aplikácií má povolené zobrazovanie cez iné aplikácie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f5aec2f..8a53634 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Zasebnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Onemogočil skrbnik"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ni na voljo"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Stanje varnosti"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaklepanje zaslona, odklepanje z obrazom"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaklepanje zaslona, prstni odtis"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Pri odklepanju z obrazom v aplikacijah vedno zahtevaj korak potrditve"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Izbriši obraz"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastavite odklepanje z obrazom"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Odklepanje z obrazom omogoča, da odklenete napravo, se prijavite v aplikacije in potrdite plačila.\n\nUpoštevajte:\nče pogledate proti telefonu, ga boste morda nenamerno odklenili.\n\nTelefon lahko odklene nekdo drug, če ga podrži pred vašim obrazom, ko imate odprte oči.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Odklepanje z obrazom omogoča, da odklenete napravo, se prijavite v aplikacije in potrdite plačila.\n\nUpoštevajte:\nČe pogledate proti telefonu, ga boste morda nenamerno odklenili.\n\nVaš telefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Odklepanje z obrazom omogoča, da odklenete napravo, se prijavite v aplikacije in potrdite plačila.\n\nUpoštevajte:\ntelefon se lahko nenamerno odklene, če ga pogledate.\n\nTelefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom – celo kadar imate oči zaprte.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Želite izbrisati podatke o obrazu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podatki o obrazu, ki se uporabljajo za odklepanje z obrazom, bodo trajno in varno izbrisani. Po odstranitvi boste za odklepanje telefona, prijavo v aplikacije in potrjevanje plačil potrebovali kodo PIN, vzorec ali geslo."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteta"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonimna identiteta"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Geslo"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikator gesla SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Pokaži geslo"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Izbira pasu dostopne točke"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Samodejno"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Skupna raba povezave Wi‑Fi s to napravo …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezovanje …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Skupna raba dostopne točke"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Potrdite, da ste res vi"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potrdite, da ste res vi"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Brez samodejnega izklopa"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Samodejni izklop ob sončnem vzhodu"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Temna tema z resnično črno barvo poskrbi, da imate dalj časa energijo v bateriji. Razporedi temne teme z vklopom počakajo, dokler se zaslon ne izklopi."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Temna tema s črnim ozadjem poskrbi, da imate dalj časa energijo v bateriji na nekaterih zaslonih. Razporedi temne teme z vklopom počakajo, dokler se zaslon ne izklopi."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Časovna omejitev za zaslon"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po toliko časa nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Nastavite kodo PIN za prstni odtis"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Zaradi varnosti nastavite vzorec"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Znova vnesite geslo"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Vnesite geslo za delovni profil"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potrdite vzorec"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Vnesite vzorec za del. profil"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Znova vnesite kodo PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Vnesite kodo PIN za delovni profil"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Gesli se ne ujemata"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Kodi PIN se ne ujemata"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Znova narišite vzorec"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Bralnik zaslona je predvsem za slepe in slabovidne"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Če želite slišati vsebino elementov na zaslonu, se jih dotaknite"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavitve podnapisov"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povečava"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Povečava"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Območje povečave"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Prikaži kontrolnik za premikanje"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Prikaz kontrolnika v obliki igralne palice za premikanje območja povečave"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Nastavitve povečave"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Povečanje z bližnjico in trikratnim dotikom"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"O povečavi"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Možnosti"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Povečava zaslona"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Če želite povečati, se trikrat dotaknite"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Če želite povečati, se dotaknite gumba"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Izberite kartico SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Oranžna"</string>
     <string name="color_purple" msgid="6603701972079904843">"Vijolična"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rožnata"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Ni vstavljenih kartic SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Stanje kartice SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Stanje kartice SIM (reža za SIM %1$d)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> omogočenih</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne moti"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Samo prejemanje obvestil pomembnih oseb in aplikacij"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omejitev prekinitev"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Vklop načina »ne moti«"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Izjeme"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizualnih motenj"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dovoli vizualne znake"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Ko je vklopljen način »ne moti«"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Dovoljene zvočne motnje"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Omejitev obvestil"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brez zvočnega opozarjanja na obvestila"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Obvestila bodo prikazana na zaslonu"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Utišaj napravo, vendar dovoli izjeme"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Izjeme"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Urnik"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Prikaz vseh izjem"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Izjeme, ko je vklopljen način »ne moti«"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Osebe"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmi in druge motnje"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Razporedi"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Utišana obvestila"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Pri vklopljenem načinu »ne moti« bosta zvok in vibriranje izklopljena v vseh primerih razen za zgoraj omogočene elemente."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Prezri vse razen"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Prezrto"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Pogovori"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Dovoli sporočila"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Če se želite prepričati, da bo telefon zvonil, ko prejmete dovoljena sporočila, preverite, ali je naprava nastavljena na zvonjenje, vibriranje ali tihi način."</string>
     <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>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Nič"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ne dovoli nobenih klicev"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ne dovoli nobenih sporočil"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Dovoli alarme"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Obvestila o časovnikih, alarmih, varnostnih sistemih in drugih aplikacijah"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmi"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Predvajaj zvoke predstavnosti"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Zvoki predstavnosti"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Zvok videoposnetkov, iger in druge predstavnosti"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"predstavnost"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Dovoli zvoke dotikov"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Zvoki dotikov"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Zvoki tipkovnice in drugih gumbov"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"zvoki dotikov"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Dovoli opomnike"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Opomniki"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Obvestila o opravilih in opomnikih"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"opomniki"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Dovoli dogodke"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Dogodki"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Obvestila o prihajajočih dogodkih v koledarju"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Aplikacijam dovoli preglasitev"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Izjeme aplikacij"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Prekrivanje drugih aplikacij"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Dovoli prekrivanje drugih aplikacij"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Omogočite tej aplikaciji, da prekrije druge aplikacije, ki jih uporabljate. To lahko vpliva na uporabo teh aplikacij ali spremeni njihov običajen videz ali delovanje."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Dostop do vseh datotek"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Dovoli dostop za upravljanje vseh datotek"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Tej aplikaciji dovolite, da bere, spreminja in briše vse datoteke v tej napravi ali drugih povezanih nosilcih za shranjevanje. Če daste to dovoljenje, bo aplikacija morda dostopala do datotek brez vaše vednosti."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Lahko dostopa do vseh datotek"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr navidezna resničnost poslušalec stereo storitev za pomoč"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Prekrivanje drugih aplikacij"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g> aplikacij, ki lahko prekrivajo druge aplikacije"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index d41182f..0d3e06f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës për ruajtjen e kredencialeve"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Cakto \"Vendndodhja ime\", shkyçjen e ekranit, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatësia"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Çaktivizuar nga administratori"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Nuk ofrohet"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Statusi i sigurisë"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kyçja e ekranit, shkyçja me fytyrë"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kyçja e ekranit, gjurma e gishtit"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kërko gjithmonë hapin e konfirmimit kur përdor shkyçjen me fytyrë në aplikacione"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Fshi të dhënat e fytyrës"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfiguro shkyçjen me fytyrë"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Përdor \"Shkyçjen me fytyrën\" për të shkyçur pajisjen, për t\'u identifikuar tek aplikacionet dhe për të konfirmuar pagesat.\n\nKi parasysh:\nShikimi te telefoni mund ta shkyçë atë kur nuk planifikon këtë.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote kur i ke sytë të hapur.\n\nTelefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Përdor \"Shkyçjen me fytyrën\" për të shkyçur pajisjen, për t\'u identifikuar tek aplikacionet dhe për të konfirmuar pagesat.\n\nKi parasysh:\nShikimi te telefoni mund ta shkyçë atë edhe nëse nuk ke për qëllim ta bësh.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote.\n\nTelefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Përdor \"Shkyçjen me fytyrën\" për të shkyçur pajisjen, për t\'u identifikuar tek aplikacionet dhe për të konfirmuar pagesat.\n\nKi parasysh:\nShikimi te telefoni mund ta shkyçë atë kur nuk planifikon këtë.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote, edhe nëse sytë i ke të mbyllur.\n\nTelefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Do t\'i fshish të dhënat e fytyrës?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Të dhënat e fytyrës që përdoren nga shkyçja me fytyrë do të fshihen përgjithmonë dhe në mënyrë të sigurt. Pas heqjes, do të të duhet kodi PIN, motivi ose fjalëkalimi për ta shkyçur telefonin, për t\'u identifikuar në aplikacione dhe për të konfirmuar pagesat."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identiteti"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Identitet anonim"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Fjalëkalimi"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifikues fjalëkalimi të SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Shfaq fjalëkalimin"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Zgjidh bandën AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatik"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Po ndan Wi‑Fi me këtë pajisje…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Po lidhet…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Ndaje zonën e qasjes për internet"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifiko që je ti"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifiko që je ti"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nuk do të çaktivizohet asnjëherë automatikisht"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Do të çaktivizohet automatikisht në agim"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"\"Tema e errët\" përdor të zezën e vërtetë për të të ndihmuar ta mbash baterinë tënde të karikuar për më shumë kohë. Oraret e \"Temës së errët\" presin që të aktivizohen kur ekrani është joaktiv."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"\"Tema e errët\" përdor një sfond të zi për të të ndihmuar ta mbash baterinë të karikuar për më shumë kohë në disa ekrane. Oraret e \"Temës së errët\" presin që të aktivizohen kur ekrani është joaktiv."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Koha e pritjes së ekranit"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekrani çaktivizohet"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Për të përdorur gjurmën e gishtit, vendos kodin PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Për siguri, cakto një motiv"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Fut përsëri fjalëkalimin"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Fut fjalëkalimin e punës"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Konfirmo motivin"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Fut motivin e punës"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Fut përsëri kodin PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Fut kodin PIN të punës"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Fjalëkalimet nuk përputhen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Kodet PIN nuk përputhen"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Vizato sërish motivin tënd"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Një lexues i ekranit kryesisht për personat e verbër dhe me shikim të dobët"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Trokit artikujt në ekran për t\'i dëgjuar të lexuar me zë të lartë"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencat e titrave"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zmadhimi"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Zmadho"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona e zmadhimit"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Shfaq kontrolluesin e zhvendosjes"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Shfaq një kontrollues si dorezë për të zhvendosur zonën e zmadhimit"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Cilësimet e zmadhimit"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Zmadho me shkurtore dhe tri trokitje"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Rreth \"Zmadhimit\""</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Opsionet"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zmadho ekranin"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Trokit 3 herë për ta zmadhuar"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Trokit te një buton për të zmadhuar"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Zgjidh kartën SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"portokalli"</string>
     <string name="color_purple" msgid="6603701972079904843">"Vjollcë"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rozë"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Nuk janë futur karta SIM"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Statusi i kartës SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Statusi i kartës SIM (foleja %1$d e SIM)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 aktiv</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivizo \"Mos shqetëso\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Përjashtime"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blloko shqetësimet vizuale"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Lejo sinjalet vizuale"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kur modaliteti \"Mos shqetëso\" është aktiv"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Lejo ndërprerjet që lëshojnë tinguj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Kufizo njoftimet"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Asnjë tingull nga njoftimet"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Do të shikosh njoftime në ekranin tënd"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Çaktivizo zërin e pajisjes, por lejo përjashtimet"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Përjashtimet"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Orari"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Shiko të gjitha përjashtimet"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Përjashtimet kur modaliteti \"Mos shqetëso\" është aktiv"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personat"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacionet"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmet dhe ndërprerjet e tjera"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Oraret"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Njoftimet e kaluara në heshtje"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kur modaliteti \"Mos shqetëso\" është aktiv, tingujt dhe dridhjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Çaktivizo audion për të gjitha përveçse për"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Pa zë"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Bisedat"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Lejo mesazhet"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Sigurohu që mesazhet e lejuara të lëshojnë tingull, kontrollo nëse pajisja jote është caktuar me zile, dridhje ose heshtje."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Asnjë"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Mos lejo asnjë telefonatë"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Mos lejo mesazhe"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Lejo alarmet"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmet"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Nga kohëmatësit, alarmet, sistemet e sigurisë dhe aplikacione të tjera"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmet"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Luaj tingujt e medias"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Tingujt e medias"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Nga videot, lojërat dhe media të tjera"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Lejo tingujt e prekjes"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Tingujt e prekjes"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Nga tastiera dhe butonat e tjerë"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"tingujt e prekjes"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Lejo alarmet rikujtuese"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Alarmet rikujtuese"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Nga detyrat dhe alarmet rikujtuese"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"alarmet rikujtuese"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Lejo ngjarjet"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Ngjarjet"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Nga ngjarjet e ardhshme të kalendarit"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Lejo aplikacionet ta anulojnë"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Përjashtimet e aplikacioneve"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Shfaq mbi aplikacionet e tjera"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Lejo shfaqjen mbi aplikacionet e tjera"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Lejoje këtë aplikacion të shfaqet në krye të aplikacioneve të tjera që po përdor. Kjo mund të ndërhyjë me përdorimin tënd të atyre aplikacioneve ose mund të ndryshojë mënyrën se si ata duken ose sillen."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Qasje te të gjithë skedarët"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Lejo qasjen për të menaxhuar të gjithë skedarët"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Lejo që ky aplikacion të lexojë, modifikojë dhe fshijë të gjithë skedarët në këtë pajisje ose në çdo volum hapësire ruajtjeje të lidhur. Nëse lejohet, aplikacioni mund të ketë qasje te skedarët pa dijeninë tënde të qartë."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Mund të ketë qasje te të gjithë skedarët"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr realitet virtual dëgjues stereo ndihmues shërbim"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Shfaq mbi aplikacionet e tjera"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> nga <xliff:g id="COUNT_1">%2$d</xliff:g> gjithsej lejohen të shfaqen mbi aplikacionet e tjera"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c63ce08..b6786d1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -316,7 +316,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Приватност"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Администратор је онемогућио"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Није доступно"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Безбедносни статус"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Закључавање екрана, откључавање лицем"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Закључавање екрана, отисак прста"</string>
@@ -374,7 +374,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Увек захтевај потврду при коришћењу откључавања лицем у апликацијама"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Бриши податке о лицу"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Подесите откључавање лицем"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Откључајте уређај, пријавите се у апликацију и потврдите плаћање помоћу откључавања лицем.\n\nИмајте у виду:\nАко погледате телефон, можете нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу док су вам очи отворене.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Откључајте уређај, пријавите се у апликацију и потврдите плаћање помоћу откључавања лицем.\n\nИмајте у виду:\nАко погледате телефон, можете нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Откључајте уређај, пријавите се у апликацију и потврдите плаћање помоћу откључавања лицем.\n\nИмајте у виду:\nАко погледате телефон, можете нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу чак и ако су вам очи затворене.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Бришете податке о лицу?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Подаци о лицу које користи откључавање лицем биће трајно и безбедно избрисани. После уклањања требаће вам PIN, образац или лозинка да бисте откључали телефон, пријављивали се у апликације и потврђивали плаћања."</string>
@@ -894,7 +894,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Идентитет"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Анонимни идентитет"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Лозинка"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Идентификатор SAE лозинке"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Прикажи лозинку"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Изаберите опсег приступне тачке"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Аутоматски"</string>
@@ -935,9 +934,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Дели се Wi‑Fi са овим уређајем…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Повезује се…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Делите хотспот"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Потврдите да сте то ви"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Потврдите свој идентитет"</string>
     <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" 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>
@@ -1246,7 +1247,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Укључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Никада се не искључује аутоматски"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Искључује се аутоматски када сунце изађе"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Тамна тема користи црну боју да би батерија трајала дуже. Распореди тамне теме се не укључују док се екран не искључи."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Тамна тема користи црну позадину да би батерија трајала дуже на неким екранима. Распореди тамне теме се не укључују док се екран не искључи."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Гашење екрана"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Екран се искључује"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -1736,8 +1737,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Подесите PIN да бисте користили отисак"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Подесите шаблон из безбедносних разлога"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Поново унесите лозинку"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Унесите лозинку профила за Work"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Потврдите шаблон"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Унесите шаблон профила за Work"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Поново унесите PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Унесите PIN профила за Work"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Лозинке се не подударају"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-ови се не подударају"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Поново нацртајте шаблон"</string>
@@ -2074,20 +2078,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Читач екрана првенствено намењен слепим и слабовидим особама"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Додирните ставке на екрану да бисте их чули"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Подешавања титла"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увећање"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Увећање"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увећање"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Прегледајте контролер померања"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Приказ контролера попут џојстика за померање области за увећање"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Подешавања увећања"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Увећавајте помоћу пречице и троструког додира"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"О функцији Увећање"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Опције"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Увећајте приказ на екрану"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Додирните 3 пута да бисте зумирали"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Додирните дугме да бисте зумирали"</string>
@@ -3126,6 +3132,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Изаберите SIM картицу"</string>
     <string name="color_orange" msgid="216547825489739010">"Наранџаста"</string>
     <string name="color_purple" msgid="6603701972079904843">"Љубичаста"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Розе"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Није убачена ниједна SIM картица"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Статус SIM картице"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Статус SIM картице (отвор за SIM: %1$d)"</string>
@@ -3290,6 +3297,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> је омогућено</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Укључите режим Не узнемиравај"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Изузеци"</string>
@@ -3316,7 +3324,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокирај визуелна ометања"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволи визуелне сигнале"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Када је укључен режим Не узнемиравај"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Омогућите прекиде који производе звук"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Ограничите обавештења"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Без звучног сигнала за обавештења"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Видећете обавештења на екрану"</string>
@@ -3379,10 +3387,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Искључи звук уређаја али дозволи изузетке"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Изузеци"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Распоред"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Погледајте све изузетке"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Изузеци када је укључен режим Не узнемиравај"</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_schedule" msgid="2003707171924226212">"Распореди"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Обавештења за које је искључен звук"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Када је укључен режим Не узнемиравај, звук и вибрација биће искључени, осим за ставке које сте дозволили изнад."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Искључи звук за све осим за:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Звук је искључен"</string>
@@ -3649,6 +3659,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Конверзације"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Дозволи поруке"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Да бисте били сигурни да ће се дозвољене поруке чути, проверите да ли је уређај подешен да звони, вибрира или је у нечујном режиму."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Долазне поруке су блокиране за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају."</string>
@@ -3662,15 +3673,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ни од кога"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Не дозволи позиве"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Не дозвољавај никакве поруке"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Дозволи аларме"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Аларми"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Обавештења тајмера, аларма, безбедносних система и других апликација"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"аларми"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Пуштај медијске звуке"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Звукови медија"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Обавештења видео снимака, игара и других медија"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"медији"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Дозволи звукове при додиру"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Звукови при додиру"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Обавештења тастатуре и друге дугмади"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"звукови при додиру"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Дозволи подсетнике"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Подсетници"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Обавештења о задацима и подсетницима"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"подсетници"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Дозволи догађаје"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Догађаји"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Обавештења о предстојећим догађајима из календара"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволи да апликације занемарују"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Изузеци за апликације"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3977,6 +3993,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Приказ преко других апликација"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Дозволи приказ преко других апликација"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Омогућите овој апликацији да се приказује преко других апликација које користите. То може да омета коришћење тих апликација или да промени њихов изглед или понашање."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Приступ свим датотекама"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Дозволи приступ за управљање свим датотекама"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Дозволите да ова апликација чита, мења и брише све датотеке на овом уређају или свим повезаним уређајима за складиштење. Ако то дозволите, апликација може да приступа датотекама без вашег знања."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Може да приступа свим датотекама"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"вр виртуелна реалност обрађивач услуга стерео помагача"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Приказ преко других апликација"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Апликације са дозволом за приказ преко других: <xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fad5711..db834f4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Sekretess"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Inaktiverad av administratören"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Inte tillgänglig"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Säkerhetsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skärmlås, ansiktslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skärmlås, fingeravtryck"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ansiktslås i appar måste alltid bekräftas"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Radera ansiktsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurera ansiktslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Med hjälp av ansiktslås kan du låsa upp enheten, logga in i appar och bekräfta betalningar.\n\nTänk på detta:\nOm du tittar på mobilen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din mobil om de håller upp den mot ditt ansikte när dina ögon är öppna.\n\nMobilen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Med hjälp av ansiktslås kan du låsa upp enheten, logga in i appar och bekräfta betalningar.\n\nTänk på detta:\nOm du tittar på telefonen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din telefon om de håller upp den mot ditt ansikte.\n\nTelefonen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Med hjälp av ansiktslås kan du låsa upp enheten, logga in i appar och bekräfta betalningar.\n\nTänk på detta:\nOm du tittar på mobilen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din mobil om de håller upp den mot ditt ansikte, även om du inte har ögonen öppna.\n\nMobilen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vill du radera ansiktsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ansiktsdatan som används för ansiktslåset tas bort permanent på ett säkert sätt. Efter borttagningen använder du pinkoden, det grafiska lösenordet eller lösenordet för att låsa upp telefonen, logga in i appar och bekräfta betalningar ."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonym identitet"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Lösenord"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Lösenordsidentifierare för SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Visa lösenord"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Välj AP-band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatiskt"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi delas med den här enheten …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Ansluter …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Dela surfzon"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Verifiera din identitet"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifiera din identitet"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Inaktiveras aldrig automatiskt"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Inaktiveras automatiskt vid soluppgången"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Med mörkt tema används äkta svärta så att ditt batteri räcker längre. Om mörkt tema är schemalagt aktiveras det inte förrän skärmen är av."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Med mörkt tema används en svart bakgrund på vissa skärmar så att batteriet räcker längre. Om mörkt tema är schemalagt aktiveras det inte förrän skärmen är av."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Skärmens tidsgräns"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Pinkod krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Ange ett grafiskt lösenord som skydd"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ange ditt lösenord igen"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ange lösenordet för jobbprofilen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekräfta grafiskt lösenord"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ange det grafiska lösenordet"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ange din pinkod igen"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ange pinkoden för jobbprofilen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Lösenorden matchar inte"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-koderna matchar inte"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Rita det grafiska lösenordet igen"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Skärmläsaren är främst avsedd för blinda eller personer med nedsatt syn"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tryck på objekt på skärmen om du vill höra dem upplästa"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Förstora"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Förstoringsområde"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Visa förflyttningsreglage"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Visa ett joystickliknande reglage så att du kan flytta förstoringsområdet"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Inställningar för förstoring"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Förstora med genväg och tryck snabbt tre gånger"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Om förstoring"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Alternativ"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zooma in på skärmen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tryck tre gånger om du vill zooma"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tryck på en knapp för att zooma"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Välj SIM-kort"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lila"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Rosa"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Inga SIM-kort har anslutits"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status för SIM-kort"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM-status (SIM-kortsplats %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 har aktiverats</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivera Stör ej."</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Undantag"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blockera synliga störningar"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillåt synliga signaler"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"När Stör ej har aktiverats"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillåt avbrott med ljud"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Begränsa aviseringar"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aviseringar hörs inte"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Aviseringar visas på skärmen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Stäng av ljudet men tillåt undantag"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Undantag"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Schema"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Visa alla undantag"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Undantag till Stör ej"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Appar"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarm och andra störningsmoment"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Scheman"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Aviseringar som hindras från att visas på skärmen"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Ljud och vibrationer stängs av när Stör ej har aktiverats, utom objekten du har tillåtit ovan."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Stäng av ljudet för alla utom"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Ljudet har stängts av"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> till</item>
       <item quantity="one">1 till</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Konversationer"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Tillåt meddelanden"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Kontrollera om enheten är inställd på att ringa, vibrera eller på ljudlös så du vet att tillåtna meddelanden hörs."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Ingen"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Tillåt inga samtal"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Tillåt inga sms"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Tillåt alarm"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Från timers, alarm, säkerhetssystem och andra appar"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarm"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Spela upp medieljud"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Medieljud"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Från videor, spel och annan media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"ljud från video"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Tillåt ljud vid tryck"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Ljud vid tryck"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Från tangentbordet och andra knappar"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ljud vid tryck"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Tillåt påminnelser"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Påminnelser"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Från uppgifter och andra påminnelser"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"påminnelser"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Tillåt händelser"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Händelser"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Från kommande kalenderhändelser"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Tillåt att appar åsidosätter funktionen"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Undantagna appar"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Visa ovanpå andra appar"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Tillåt visning ovanpå andra appar"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Tillåt att den här appen visas ovanpå andra appar. Detta kan inverka på ett störande sätt på användningen av de andra apparna eller göra så att de verkar se ut eller fungera annorlunda."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Åtkomst till alla filer"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Tillåt hanteringsåtkomst för alla filer"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Tillåt att den här appen får läsa, redigera och radera alla filer på enheten och eventuella anslutna lagringsutrymmen. Om du beviljar behörigheten kan appen komma åt filer utan att du informeras."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Har åtkomst till alla filer"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtuell verklighet lyssnare stereo hjälptjänst"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Visa ovanpå andra appar"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> appar får visas ovanpå andra appar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ebcf461..784c829 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Faragha"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Imezimwa na msimamizi"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Haipatikani"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Hali ya usalama"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kufunga skrini, kufungua kwa uso"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kufunga skrini, alama ya kidole"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Iombe uthibitishaji kila wakati unapofungua kwa uso katika programu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Futa data ya uso"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Weka mipangilio ya kufungua kwa uso"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo.\n\nKumbuka:\n Kuangalia simu kunaweza kuifungua hata ikiwa huna lengo la kufanya hivyo.\n\n Simu yako inaweza kufunguliwa na mtu mwingine ikiwa imeshikiwa karibu na uso wako na umefungua macho.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana sana kama vile ndugu mnayelandana."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo.\n\nKumbuka:\n Kuangalia simu kunaweza kuifungua hata ikiwa huna lengo la kufanya hivyo.\n\n Simu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo.\n\nKumbuka:\nKuangalia simu kunaweza kuifungua wakati hujakusudia.\n\nSimu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako, hata ukiwa umefunga macho.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Je, ungependa kufuta data ya uso?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data ya uso inayotumiwa na kipengele cha kufungua kwa uso itafutwa kabisa kwa usalama. Baada ya kuondoa, utahitaji PIN, mchoro au nenosiri lako ili kufungua simu yako, kuingia kwenye akaunti za programu na kuthibitisha malipo."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Kitambulisho"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Kitambulisho kisichojulikana"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Nenosiri"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Kitambulishi cha nenosiri la SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Onyesha nenosiri"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Chagua Bendi ya AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Otomatiki"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Inashiriki Wi‑Fi na kifaa hiki…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Inaunganisha…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Shiriki mtandaopepe"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Thibitisha kuwa ni wewe"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Thibitisha kwamba ni wewe"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Haitawahi kuzimwa kiotomatiki"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Itazima kiotomatiki kutakapopambazuka"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Mandhari meusi hutumia rangi nyeusi ili kusaidia kuboresha muda wa matumizi ya betri. Ratiba za Mandhari meusi hujiwasha pindi skrini ya simu yako inapozima."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Mandhari meusi hutumia mandharinyuma meusi ili kusaidia kuboresha muda wa matumizi ya betri kwenye baadhi ya skrini. Ratiba za Mandhari meusi hujiwasha pindi skrini ya simu yako inapozima."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Muda wa skrini kujizima"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Weka PIN ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Kwa sababu za usalama, weka mchoro"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Weka nenosiri lako tena"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Weka nenosiri lako la kazini"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Thibitisha mchoro wako"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Weka mchoro wako wa kazini"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Weka PIN yako tena"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Weka PIN yako ya kazini"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Nenosiri halilingani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN hailingani"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Chora mchoro wako tena"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Gusa vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Mapendeleo ya manukuu"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukuzaji"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Kuza"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Eneo la ukuzaji"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Onyesha kidhibiti cha kusogeza"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Onyesha kidhibiti kinachofanana na usukani ili usogeze eneo la ukuzaji"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Mipangilio ya ukuzaji"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Kuza ukitumia njia ya mkato na kugonga mara tatu"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Kuhusu Kukuza"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Chaguo"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Vuta karibu kwenye skrini"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Gusa mara 3 ili ukuze"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Gusa kitufe ili ukuze"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Chagua SIM kadi"</string>
     <string name="color_orange" msgid="216547825489739010">"Rangi ya machungwa"</string>
     <string name="color_purple" msgid="6603701972079904843">"Zambarau"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Waridi"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Hakuna SIM kadi zilizoingizwa"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Hali ya SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Hali ya SIM (nafasi ya sim ya %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 imewashwa</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Washa kipengele cha Usinisumbue"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Hali maalum"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Zuia ukatizaji wa maonyesho"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Ruhusu ishara zinazoonekena"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Wakati umewasha kipengele cha Usinisumbue"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Ruhusu usumbufu unaotoa sauti"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Dhibiti arifa"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Arifa zisitoe sauti"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Utaona arifa kwenye skrini yako"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Zima sauti ya kifaa lakini uruhusu hali fulani maalum"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Hali maalum"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ratibu"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Angalia hali zote maalum"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Zisizofuata kanuni wakati umewasha kipengele cha Usinisumbue"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Watu"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Programu"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Kengele na usumbufu mwingine"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Ratiba"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Arifa zilizozimwa sauti"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Wakati umewasha mipangilio ya Usinisumbue, milio na mitetemo itazimwa, isipokuwa inayotoka kwenye vipengee ambavyo umeruhusu hapo juu."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Zima zote isipokuwa"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Imezimwa sauti"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">Wengine <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
       <item quantity="one">Mwingine 1</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"Mazungumzo"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Ruhusu ujumbe"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Ili uhakikishe kuwa ujumbe unaoruhusiwa unatoa sauti, angalia kama umeweka mipangilio ya kutoa sauti, kutetema ama kimya kwenye kifaa chako."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Hamna"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Usiruhusu simu yoyote"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Usiruhusu ujumbe wowote"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Ruhusu kengele"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Kengele"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Kutoka vipima muda, kengele, mifumo ya usalama na programu zingine"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"kengele"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Cheza sauti za video"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Sauti za maudhui"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Kutoka video, michezo na maudhui mengine"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"maudhui"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Ruhusu sauti unapogusa"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Sauti inapoguswa"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Kutoka kibodi yako na vitufe vingine"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"sauti inapoguswa"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Ruhusu vikumbusho"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Vikumbusho"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Kutoka majukumu na vikumbusho"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"vikumbusho"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Ruhusu matukio"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Matukio"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Kutoka matukio yajayo ya kalenda"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Ruhusu programu zibatilishe hali"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Hali maalum kwa programu"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Onyesha juu ya programu zingine"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Programu ionekane juu ya zingine"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Ruhusu programu hii ionekane juu ya programu zingine unazotumia. Huenda hali hii ikaathiri jinsi unavyotumia programu hizo au kubadilisha jinsi zinavyoonekana au kufanya kazi."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Kufikia faili zote"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Ruhusu ufikiaji ili idhibiti faili zote"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Ruhusu programu hii isome, irekebishe na kufuta faili zote kwenye kifaa hiki au nafasi zozote za hifadhi zilizounganishwa. Ukiipa ruhusa, huenda programu ikafikia faili bila ufahamu wako."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Inaweza kufikia faili zote"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr uhalisia pepe kisikilizaji stereo kisaidizi huduma"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Onyesha juu ya programu zingine"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Programu <xliff:g id="COUNT_0">%1$d</xliff:g> kati ya <xliff:g id="COUNT_1">%2$d</xliff:g> zimeruhusiwa kuonekana juu ya programu zingine"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 9e081f5..a7c3859 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"தனியுரிமை"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"நிர்வாகி முடக்கியுள்ளார்"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"கிடைக்கவில்லை"</string>
     <string name="security_status_title" msgid="6958004275337618656">"பாதுகாப்பு நிலை"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"திரைப் பூட்டு, முகம் காட்டித் திறத்தல்"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ஸ்கிரீன் லாக், கைரேகை"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ஆப்ஸை முகம் காட்டித் திறக்கும்போதெல்லாம் உறுதிப்படுத்துவது அவசியம்"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"முகங்களை நீக்குக"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\'முகம் காட்டித் திறத்தலை’ அமை"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"உங்கள் சாதனத்தைத் திறக்கவும் ஆப்ஸில் உள்நுழையவும் பேமெண்ட்டுகளை உறுதிப்படுத்தவும் \'முகம் காட்டித் திறத்தலைப்\' பயன்படுத்தலாம்.\n\nகவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் கண்கள் திறந்திருக்கும் போது முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nபிள்ளைகள், உடன் பிறந்தவர்கள் போன்று உங்களின் சாயலில் இருப்பவர்களும் மொபைலைத் திறக்க முடியும்."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"உங்கள் சாதனத்தைத் திறக்கவும் ஆப்ஸில் உள்நுழையவும் பேமெண்ட்டுகளை உறுதிப்படுத்தவும் \'முகம் காட்டித் திறத்தலைப்\' பயன்படுத்தலாம்.\n\nகவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nபிள்ளைகள், உடன் பிறந்தவர்கள் போன்று உங்களின் சாயலில் இருப்பவர்களும் மொபைலைத் திறக்க முடியும்."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"உங்கள் சாதனத்தைத் திறக்கவும் ஆப்ஸில் உள்நுழையவும் பேமெண்ட்டுகளை உறுதிப்படுத்தவும் \'முகம் காட்டித் திறத்தலைப்\' பயன்படுத்தலாம்.\n\nகவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் கண்கள் மூடியிருந்தாலும்கூட முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nபிள்ளைகள், உடன் பிறந்தவர்கள் போன்று உங்களின் சாயலில் இருப்பவர்களும் மொபைலைத் திறக்க முடியும்."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"முகத்திற்கான தரவை அகற்றவா?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'முகம் காட்டித் திறத்தல்\' அம்சத்தால் பயன்படுத்தப்படும் முகங்கள் நிரந்தரமாகவும் பாதுகாப்பாகவும் நீக்கப்படும். அவ்வாறு அகற்றப்பட்ட பிறகு மொபைலைத் திறக்கவும், ஆப்ஸில் உள்நுழையவும், பேமெண்ட்டுகளை உறுதிப்படுத்தவும் உங்கள் பின், பேட்டர்ன் அல்லது கடவுச்சொல்லைப் பயன்படுத்தவும்."</string>
@@ -771,10 +771,8 @@
     <string name="wifi_ask_disable" msgid="1663208096020309639">"வைஃபையை முடக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"பிழைதிருத்த, ஆப்ஸ் பைட்கோடை சரிபார்த்தல்"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"பிழைதிருத்த, ஆப்ஸிற்கான பைட்கோடைச் சரிபார்க்க ARTயை அனுமதிக்கும்"</string>
-    <!-- no translation found for show_refresh_rate (5742688821872354973) -->
-    <skip />
-    <!-- no translation found for show_refresh_rate_summary (3558118122374609663) -->
-    <skip />
+    <string name="show_refresh_rate" msgid="5742688821872354973">"ரெஃப்ரெஷ் விகிதம் காட்டு"</string>
+    <string name="show_refresh_rate_summary" msgid="3558118122374609663">"தற்போதைய டிஸ்ப்ளே ரெஃப்ரெஷ் விகிதத்தைக் காட்டு"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"டேப்லெட்டானது NFC சாதனம் ஒன்றைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"மொபைலானது NFC சாதனம் ஒன்றைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
@@ -879,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"அடையாளம்"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"அநாமதேய அடையாளம்"</string>
     <string name="wifi_password" msgid="1458802324849513755">"கடவுச்சொல்"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE கடவுச்சொல் அடையாளங்காட்டி"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"கடவுச்சொல்லைக் காட்டு"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP அலைவரிசையைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"தானியங்கு"</string>
@@ -920,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"இந்தச் சாதனத்துடன் வைஃபை பகிரப்படுகிறது…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"இணைக்கிறது…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ஹாட்ஸ்பாட்டைப் பகிர்தல்"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"நீங்கள்தான் என உறுதிசெய்க"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"நீங்கள்தான் என்பதை உறுதிப்படுத்தவும்"</string>
     <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" 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>
@@ -1228,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ஒருபோதும் தானாக முடக்கப்படாது"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"உங்கள் பேட்டரி நீண்ட காலம் நீடித்திருக்கும் பொருட்டு கருப்பு நிறத்தை டார்க் தீம் பயன்படுத்துகிறது. திரை ஒருமுறை ஆஃப் ஆகும்வரை டார்க் தீம் இயக்கப்படாமல் காத்திருப்பு நிலையில் இருக்கும், அதன்பிறகு இயக்கப்படும்."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"உங்கள் பேட்டரி நீண்ட காலம் நீடித்திருக்கும் பொருட்டு சில திரைகளில் கருப்பு நிறப் பின்னணியை டார்க் தீம் பயன்படுத்துகிறது. உங்கள் திரை ஆஃப் ஆகும் வரை டார்க் தீம் ஆனில் இருக்குமாறு அமைக்கப்பட்டிருக்கும்."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"திரை அணைவு நேரம்"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"திரை முடக்கப்படும்"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -1716,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"கைரேகையைப் பயன்படுத்த, பின்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"பாதுகாப்பிற்காக, பேட்டர்னை அமைக்கவும்"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"பணிக்கான கடவுச்சொல்லை உள்ளிடுக"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"பணிக்கான பேட்டர்னை உள்ளிடுக"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"பின்னை மீண்டும் உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"பணிக்கான பின்னை உள்ளிடுக"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"பின்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"பேட்டர்னை மீண்டும் வரையவும்"</string>
@@ -2053,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"திரைப் படிப்பான் முக்கியமாக பார்வையற்றோர் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக வடிவமைக்கப்பட்டது"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"உங்கள் திரையில் உள்ளவற்றைச் சத்தமாகப் படித்துக் காட்ட, அவற்றைத் தட்டவும்"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"வசன விருப்பத்தேர்வுகள்"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"பெரிதாக்கல்"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"பெரிதாக்கல்"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"பெரிதாக்கும் பகுதி"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"நகர்த்துவதற்கான கண்ட்ரோலரை காட்டும்"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"பெரிதாக்கும் பகுதிக்கு நகர்த்த ஜாய்ஸ்டிக் போன்ற ஒரு கண்ட்ரோலரைக் காட்டும்"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"பெரிதாக்கும் அமைப்புகள்"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ஷார்ட்கட் &amp; 3 முறை தட்டுவதன் மூலம் பெரிதாக்கலாம்"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"பெரிதாக்கல் பற்றி"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"விருப்பங்கள்"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"திரையில் பெரிதாக்குவதை இயக்கும்"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"அளவை மாற்ற, 3 முறை தட்டவும்"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"திரையைப் பெரிதாக்க, பட்டனைத் தட்டவும்"</string>
@@ -2081,16 +2085,11 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings_without_talkback" msgid="8744979550867005938">"அணுகல்தன்மை சேவையை ஆன் அல்லது ஆஃப் செய்ய இரண்டு விரல்களால் திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்யவும்.\n\nசேவைகளுக்கு இடையே மாற இரண்டு விரல்களால் மேல்நோக்கி ஸ்வைப் செய்து பிடிக்கவும்."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_with_talkback" msgid="9124610711696596426">"அணுகல்தன்மை சேவையை ஆன் அல்லது ஆஃப் செய்ய மூன்று விரல்களால் திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்யவும்.\n\nசேவைகளுக்கு இடையே மாற மூன்று விரல்களால் மேல்நோக்கி ஸ்வைப் செய்து பிடிக்கவும்."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"புரிந்தது"</string>
-    <!-- no translation found for accessibility_shortcut_title (7219851818023989864) -->
-    <skip />
-    <!-- no translation found for accessibility_magnification_shortcut_title (3850925633238639131) -->
-    <skip />
-    <!-- no translation found for accessibility_shortcut_edit_dialog_title (4922086411442295974) -->
-    <skip />
-    <!-- no translation found for accessibility_shortcut_edit_dialog_title_magnification (9029389159199076646) -->
-    <skip />
-    <!-- no translation found for accessibility_shortcut_edit_dialog_title_daltonizer (2875485140645140606) -->
-    <skip />
+    <string name="accessibility_shortcut_title" msgid="7219851818023989864">"திறப்பதற்கு ஷார்ட்கட்டைப் பயன்படுத்தும்"</string>
+    <string name="accessibility_magnification_shortcut_title" msgid="3850925633238639131">"பெரிதாக்க ஷார்ட்கட்டைப் பயன்படுத்தும்"</string>
+    <string name="accessibility_shortcut_edit_dialog_title" msgid="4922086411442295974">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐத் திறப்பதற்கான ஷார்ட்கட்"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_magnification" msgid="9029389159199076646">"பெரிதாக்குவதற்கான ஷார்ட்கட்"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_daltonizer" msgid="2875485140645140606">"வண்ணத் திருத்தியை திறப்பதற்கான ஷார்ட்கட்"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="2920806427635233043">"அணுகல்தன்மை பட்டன்"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="6906653331086992721">"கீழிருந்து 2 விரல்கள் மூலம் மேல்நோக்கி ஸ்வைப் செய்யவும்"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="3917444742336634202">"உங்கள் திரையின் கீழே இருக்கும் <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> பட்டனைத் தட்டவும்"</string>
@@ -3091,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"சிம் கார்டைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="color_orange" msgid="216547825489739010">"இளஞ்சிவப்பு"</string>
     <string name="color_purple" msgid="6603701972079904843">"ஊதா"</string>
+    <string name="color_pink" msgid="8596872110888626708">"பிங்க்"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"சிம் கார்டுகள் செருகப்படவில்லை"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"சிம் நிலை"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"சிம் நிலை (சிம் செருகுமிடம் %1$d)"</string>
@@ -3253,6 +3253,8 @@
       <item quantity="one">1 இயக்கப்பட்டுள்ளது</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"தொந்தரவு செய்யாதே"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"குறுக்கீடுகளைக் குறைத்தல்"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"தொந்தரவு செய்ய வேண்டாம் என்பதை ஆன் செய்யும்"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"விதிவிலக்குகள்"</string>
@@ -3279,7 +3281,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"விஷுவல் குறுக்கீடுகளைத் தடு"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"விஷுவல் சிக்னல்களை அனுமதி"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"’தொந்தரவு செய்ய வேண்டாம்’ ஆனில் இருக்கும்போது"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"அறிவிப்புகளைக் கட்டுப்படுத்துதல்"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"உங்கள் திரையில் அறிவிப்புகளைக் காண்பீர்கள்"</string>
@@ -3340,10 +3343,18 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> கால அட்டவணைகள் தானாகவே ஆன் செய்யப்படலாம்</item>
       <item quantity="one">1 கால அட்டவணை தானாகவே ஆன் செய்யப்படலாம்</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"சாதனத்தை ஒலியடக்கு ஆனால் விதிவிலக்குகளை அனுமதி"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"விதிவிலக்குகள்"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"திட்டமிடல்"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"அனைத்து விதிவிலக்குகளையும் காட்டு"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும்போது, நீங்கள் மேலே அனுமதித்துள்ளவற்றைத் தவிர, மற்றவற்றுக்கு ஒலியும் அதிர்வும் முடக்கப்படும்"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"இவற்றைத் தவிர அனைத்தையும் ஒலியடக்கு"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ஒலியடக்கப்பட்டது"</string>
@@ -3387,18 +3398,15 @@
     <string name="smart_notifications_title" msgid="8995288376897952015">"சூழலுக்கேற்ற அறிவிப்புகள்"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"சூழலுக்கேற்ற அறிவிப்புக்கான முன்னுரிமை"</string>
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"\'ஜென்டிலில்\' குறைந்த முன்னுரிமை அறிவிப்புகளைத் தானாக அமைக்கும்"</string>
-    <!-- no translation found for asst_capability_ranking_title (312998580233257581) -->
-    <skip />
-    <!-- no translation found for asst_capability_ranking_summary (2293524677144599450) -->
-    <skip />
+    <string name="asst_capability_ranking_title" msgid="312998580233257581">"சூழலுக்கேற்ற அறிவிப்புக்கான ரேங்க்"</string>
+    <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"தொடர்பின் அடிப்படையில் அறிவிப்புக்களைத் தானாக வரிசைப்படுத்தும்"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"பரிந்துரைக்கப்படும் செயல்களும் பதில்களும்"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"பரிந்துரைக்கப்படும் செயல்கள் &amp; பதில்களைத் தானாகவே காட்டு"</string>
     <string name="snooze_options_title" msgid="2109795569568344617">"அறிவிப்புகளை ஸ்னூஸ் செய்ய அனுமதி"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"ஜென்டில் அறிவிப்புகளைச் சேர்ந்த ஐகான்களை மறை"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"ஜென்டில் அறிவிப்புகளைச் சேர்ந்த ஐகான்கள் நிலைப்பட்டியில் காட்டப்படாது"</string>
     <string name="notification_badging_title" msgid="3149547223586336353">"அறிவிப்புப் புள்ளிகளைக் காட்டு"</string>
-    <!-- no translation found for notification_people_strip_title (1185857822541001139) -->
-    <skip />
+    <string name="notification_people_strip_title" msgid="1185857822541001139">"சமீபத்திய உரையாடல்களின் ஸ்டிரிப்பைக் காட்டு"</string>
     <string name="notification_bubbles_title" msgid="5681506665322329301">"குமிழ்கள்"</string>
     <string name="notification_bubbles_developer_setting_summary" msgid="3675697756601760093">"சில அறிவிப்புகள் குமிழ்களாக திரையில் தோன்றும்"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"சில அறிவிப்புகளும் வேறு உள்ளடக்கமும் திரையில் குமிழ்களாகக் காட்டப்படலாம். ஒரு குமிழைத் திறக்க அதைத் தட்டவும். நிராகரிக்க அதைத் திரைக்குக் கீழே இழுக்கவும்."</string>
@@ -3606,6 +3614,8 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> பேர்</item>
       <item quantity="one">ஒருவர்</item>
     </plurals>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"மெசேஜ்களை அனுமதி"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"அனுமதிக்கப்படும் செய்திகள் ஒலி எழுப்புமா என்பதை உறுதிப்படுத்த, உங்கள் சாதனம் ஒலி எழுப்பும்படி, அதிர்வுறும்படி அல்லது நிசப்தத்தில் உள்ளதா என்பதைச் சரிபார்க்கவும்."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ என்பதற்கு உள்வரும் மெசேஜ்கள் தடுக்கப்பட்டுள்ளன. உங்களைத் தொடர்புகொள்ள நண்பர்களையோ குடும்பத்தினரையோ வேறு தொடர்புகளையோ அனுமதிக்குமாறு அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
@@ -3619,15 +3629,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ஏதுமில்லை"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"அழைப்புகள் எதையும் அனுமதிக்காதே"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"மெசேஜ்களை அனுமதிக்காதே"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"அலாரங்களை அனுமதி"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"அலாரங்கள்"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"அலாரங்கள்"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"மீடியா ஒலிகளை இயக்கு"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"மீடியா"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"தொடுதல் ஒலிகளை அனுமதி"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"தொடுதலின்போது"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"தொடுதல் ஒலிகள்"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"நினைவூட்டல்களை அனுமதி"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"நினைவூட்டல்கள்"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"நினைவூட்டல்கள்"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"நிகழ்வுகளை அனுமதி"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"நிகழ்வுகள்"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ஆப்ஸை மேலெழுத அனுமதிக்கின்றன"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ஆப்ஸ் விதிவிலக்குகள்"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3923,6 +3944,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்த ஆப்ஸை அனுமதிக்கும். மேலும், அவற்றை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் விதத்தையோ, செயல்படும் விதத்தையோ மாற்றக்கூடும்."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"ஃபைல்கள் அனைத்திற்குமான அணுகல்"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"ஃபைல்கள் அனைத்தையும் நிர்வகிப்பதற்கு அனுமதி"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"இந்த சாதனத்திலோ இணைக்கப்பட்டுள்ள சேமிப்பகங்களிலோ உள்ள ஃபைல்கள் அனைத்தையும் படிக்கவும் நீக்கவும் அவற்றில் மாற்றங்களைச் செய்யவும் இந்த ஆப்ஸை அனுமதிக்கும். அனுமதி வழங்கப்படும் பட்சத்தில் உங்களுக்குத் தெரியாமலேயே ஃபைல்களை ஆப்ஸ் அணுகக்கூடும்."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"அனைத்து ஃபைல்களையும் அணுகமுடிந்த ஆப்ஸ்"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"பிற ஆப்ஸின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> ஆப்ஸ் அனுமதிக்கப்பட்டுள்ளன"</string>
@@ -4246,15 +4271,11 @@
     <string name="information_label" msgid="6939310810756569298">"தகவல் ஐகான்"</string>
     <string name="low_label" msgid="6525629096999711220">"குறைவு"</string>
     <string name="high_label" msgid="357503396626018487">"அதிகம்"</string>
-    <!-- no translation found for left_edge (1513576842959071849) -->
-    <skip />
-    <!-- no translation found for right_edge (1505309103265829121) -->
-    <skip />
-    <!-- no translation found for back_sensitivity_dialog_message (6638367716784103306) -->
-    <skip />
+    <string name="left_edge" msgid="1513576842959071849">"இடதுபுற ஓரம்"</string>
+    <string name="right_edge" msgid="1505309103265829121">"வலதுபுற ஓரம்"</string>
+    <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"அதிக உணர்திறன் ஆப்ஸ் சைகைகளுடன் திரை ஓரங்களில் முரண்படலாம்."</string>
     <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"பின்புற உணர்திறன்"</string>
-    <!-- no translation found for gesture_settings_activity_title (6047431928567911330) -->
-    <skip />
+    <string name="gesture_settings_activity_title" msgid="6047431928567911330">"சைகை அமைப்புகள்"</string>
     <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"சைகை வழிசெலுத்தல், பின்புற உணர்திறன், பின்புற சைகை"</string>
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"மொபைல் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
@@ -4692,18 +4713,12 @@
     <string name="work_policy_privacy_settings" msgid="2702644843505242596">"உங்கள் பணிக் கணக்கின் கொள்கை குறித்த தகவல்"</string>
     <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"உங்கள் IT நிர்வாகி கட்டுப்படுத்தும் அமைப்புகள்"</string>
     <string name="track_frame_time_keywords" msgid="7885340257945922239">"GPU"</string>
-    <!-- no translation found for bug_report_handler_title (713439959113250125) -->
-    <skip />
-    <!-- no translation found for bug_report_handler_picker_footer_text (4935758328366585673) -->
-    <skip />
-    <!-- no translation found for personal_profile_app_subtext (5586060806997067676) -->
-    <skip />
-    <!-- no translation found for work_profile_app_subtext (5043419461440127879) -->
-    <skip />
-    <!-- no translation found for system_default_app_subtext (5212055189703164839) -->
-    <skip />
-    <!-- no translation found for select_invalid_bug_report_handler_toast_text (8857326334015386692) -->
-    <skip />
+    <string name="bug_report_handler_title" msgid="713439959113250125">"பிழை அறிக்கை ஹேண்ட்லர்"</string>
+    <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"உங்கள் சாதனத்தில் பிழை அறிக்கைக்கான ஷார்ட்கட்டை எந்த ஆப்ஸ் கையாள வேண்டும் என்பதைத் தீர்மானிக்கும்."</string>
+    <string name="personal_profile_app_subtext" msgid="5586060806997067676">"தனிப்பட்டது"</string>
+    <string name="work_profile_app_subtext" msgid="5043419461440127879">"பணி"</string>
+    <string name="system_default_app_subtext" msgid="5212055189703164839">"சிஸ்டத்தின் இயல்புநிலை"</string>
+    <string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"இனி இந்தத் தேர்வைப் பயன்படுத்த முடியாது. மீண்டும் முயலவும்."</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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5cf94e7..dae1dae 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"గోప్యత"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"నిర్వాహకులు నిలిపివేసారు"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"అందుబాటులో లేదు"</string>
     <string name="security_status_title" msgid="6958004275337618656">"భద్రతా స్థితి"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"స్క్రీన్ లాక్, ముఖం అన్‌లాక్"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"స్క్రీన్ లాక్, వేలిముద్ర"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"యాప్‌లలో ముఖంతో అన్‌లాక్ ఉపయోగించేటప్పుడల్లా నిర్ధారణ దశ అవసరమవుతుంది"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ముఖ డేటాను తొలగించు"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\"ముఖంతో అన్‌లాక్\"‌ను సెటప్ చేయి"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, చెల్లింపులను నిర్ధారించడానికి ముఖంతో అన్‌లాక్‌ను ఉపయోగించండి.\n\nఅలాగే, వీటిని గుర్తుంచుకోండి:\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ కళ్లు తెరిచి ఉన్న‌ప్పుడు, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇత‌రులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహ‌ర‌ణ‌కు, మీ క‌వ‌ల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయ‌గ‌లిగే అవకాశం ఉంది."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, చెల్లింపులను నిర్ధారించడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి.\n\nఅలాగే, వీటిని గుర్తుంచుకోండి:\nమీకు అన్‌లాక్ చేసే ఉద్దేశ్యం లేనప్పటికీ, కేవలం ఫోన్ వైపు చూసినా కూడా అది అన్‌లాక్ అవుతుంది.\n\nమీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇత‌రులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహ‌ర‌ణ‌కు, మీ క‌వ‌ల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయ‌గ‌లిగే అవకాశం ఉంది."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, చెల్లింపులను నిర్ధారించడానికి ముఖంతో అన్‌లాక్‌ను ఉపయోగించండి.\n\nఅలాగే, వీటిని గుర్తుంచుకోండి:\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ కళ్లు మూసి ఉన్నా కూడా, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇత‌రులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహ‌ర‌ణ‌కు, మీ క‌వ‌ల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయ‌గ‌లిగే అవకాశం ఉంది."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ముఖ డేటాను తొలగించాలా?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ఫేస్ అన్‌లాక్ కోసం ఉపయోగించబడే ముఖానికి సంబంధించిన డేటా శాశ్వతంగా, సురక్షితంగా తొలగించబడుతుంది. తీసివేసిన తర్వాత, మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, అలాగే చెల్లింపులను నిర్ధారించడానికి మీకు మీ PIN, ఆకృతి లేదా పాస్‌వర్డ్ అవసరం అవుతాయి."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"గుర్తింపు"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"అనామక గుర్తింపు"</string>
     <string name="wifi_password" msgid="1458802324849513755">"పాస్‌వర్డ్"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE పాస్‌వర్డ్‌ ఐడెంటిఫైయర్"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"పాస్‌వర్డ్‌ను చూపు"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP బ్యాండ్ ఎంచుకోండి"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"స్వీయ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"ఈ పరికరంతో Wi‑Fiని షేర్ చేస్తోంది…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"కనెక్ట్ అవుతోంది…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"హాట్‌స్పాట్‌ను షేర్ చేయండి"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ఇది మీరేనని ధృవీకరించండి"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"అది మీరేనని ధృవీకరించండి"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"ఆన్ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ఎన్నటికీ ఆటోమేటిక్‌గా ఆఫ్ కాదు"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"సూర్యోదయ వేళకు ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"మీ బ్యాటరీ ఎక్కువ సేపు పని చేయడానికి ముదురు రంగు థీమ్ నిజమైన నలుపును ఉపయోగిస్తుంది. ముదురు రంగు థీమ్ మీ స్క్రీన్ ఆఫ్ అయ్యే వరకు ఆన్ చేయాల్సిన నిరీక్షణ సమయాన్ని షెడ్యూల్ చేస్తుంది."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"మీ బ్యాటరీ ఎక్కువ సేపు పని చేయడానికి సహాయపడేలా ముదురు రంగు థీమ్ అనేది కొన్ని స్క్రీన్‌ల మీద నలుపు బ్యాక్‌గ్రౌండ్‌ను ఉపయోగిస్తుంది. ఆన్ చేయాల్సిన నిరీక్షణ సమయాన్ని ముదురు రంగు థీమ్ అనేది మీ స్క్రీన్ ఆఫ్ అయ్యే వరకు షెడ్యూల్ చేస్తుంది."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"స్క్రీన్ గడువు ముగింపు"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"స్క్రీన్‌ను ఆఫ్ చేయాల్సిన సమయం"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"ఇన్‌యాక్టివ్‌గా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"వేలిముద్రకు పిన్ సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"భద్రత కోసం ఆకృతిని సెట్ చేయండి"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"మీ పాస్‌వర్డ్‌ను మళ్ళీ నమోదు చేయండి"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"మీ కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"మీ నమూనాను నిర్ధారించండి"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"మీ కార్యాలయ నమూనాను నమోదు చేయి"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"మీ పిన్‌ను మళ్లీ నమోదు చేయండి"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"మీ కార్యాలయ పిన్‌ను నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"పాస్‌‌వర్డ్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"పిన్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"మీ ఆకృతిని మళ్లీ గీయండి"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"ప్రధానంగా అంధులు, అస్పష్టమైన చూపు ఉన్న వారి కోసం ఉద్దేశించిన స్క్రీన్ రీడర్"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"మీ స్క్రీన్‌పై ఉన్న అంశాలను నొక్కడం ద్వారా అవి బిగ్గరగా చదవబడతాయి"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"శీర్షిక ప్రాధాన్యతలు"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"మాగ్నిఫికేషన్"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"మాగ్నిఫికేషన్ ప్రాంతం"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"కదలికల కంట్రోలర్‌ను చూపడం"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"మాగ్నిఫికేషన్ ప్రాంతంలో కదపడానికి వీలుగా జాయ్ స్టిక్ లాంటి కంట్రోలర్‌ను చూపించు"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"మాగ్నిఫై సెట్టింగులు"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"షార్ట్‌కట్‌తో, మూడుసార్లు నొక్కి మాగ్నిఫై చేయండి"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"మాగ్నిఫై గురించి"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ఎంపికలు"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"దగ్గరకు జూమ్ చేస్తుంది"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"జూమ్ చేయడానికి 3 సార్లు నొక్కండి"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"జూమ్ చేయడం కోసం బటన్‌ని నొక్కండి"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"సిమ్ కార్డ్‌ను ఎంచుకోండి"</string>
     <string name="color_orange" msgid="216547825489739010">"నారింజ రంగు"</string>
     <string name="color_purple" msgid="6603701972079904843">"వంగ రంగు"</string>
+    <string name="color_pink" msgid="8596872110888626708">"గులాబి"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"సిమ్ కార్డులు ఏవీ చొప్పించబడలేదు"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"సిమ్ స్థితి"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"సిమ్ స్థితి (సిమ్ స్లాట్ %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 ప్రారంభించారు</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"అంతరాయం కలిగించవద్దును ఆన్ చేయండి"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"మినహాయింపులు"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"దృశ్య అంతరాయాలను బ్లాక్ చేయండి"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"దృశ్యమానత సంకేతాలను అనుమతించండి"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"అంతరాయం కలిగించవద్దు మోడ్ ఆన్‌లో ఉన్నప్పుడు"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"శబ్దాలు చేసే అంతరాయాలను అనుమతించు"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"నోటిఫికేషన్‌లను పరిమితం చేయండి"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"నోటిఫికేషన్‌ల నుండి శబ్దం లేదు"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"మీ స్క్రీన్‌పై మీకు నోటిఫికేషన్‌లు కనిపిస్తాయి"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> షెడ్యూల్‌లు ఆటోమేటిక్‌గా ఆన్ అవుతాయి</item>
       <item quantity="one">1 షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"పరికరాన్ని మ్యూట్ చేయి, కానీ మినహాయింపులను అనుమతించు"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"మినహాయింపులు"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"షెడ్యూల్"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"అన్ని మినహాయింపులను చూడండి"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"అంతరాయం కలిగించవద్దు మోడ్ ఆన్‌లో ఉన్నప్పుడు మినహాయింపులు"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"వ్యక్తులు"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"యాప్‌లు"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"అలారంలు &amp; ఇతర అంతరాయాలు"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"షెడ్యూల్‌లు"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లు"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"అంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, పైన మీరు అనుమతించే అంశాల‌కు త‌ప్పించి  మిగిలిన వాటికి శబ్దం, వైబ్రేషన్ మ్యూట్ చేయబడతాయి."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"కొన్ని మినహా అన్ని మ్యూట్ చేయండి"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"మ్యూట్ చేయబడినవి"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">మరో <xliff:g id="NUM_PEOPLE">%d</xliff:g> మంది</item>
       <item quantity="one">మరో 1 వ్యక్తి</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"సంభాషణలు"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"సందేశాలను అనుమతించు"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"అనుమతించిన సందేశాలు వచ్చినప్పుడు ఖచ్చితంగా శబ్దం వస్తుందో లేదో, అసలు మీ పరికరం రింగ్‌, వైబ్రేట్ లేదా నిశ్శబ్ద మోడ్‌లలో ఏ మోడ్‌లో ఉందో ఓసారి తనిఖీ చేసి చూడండి."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’కి సంబంధించిన ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ఏవీ వద్దు"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ఏ కాల్‌లను అనుమతించవద్దు"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"సందేశాలు ఏవీ అనుమతించవద్దు"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"అలారంలను అనుమతించు"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"అలారాలు"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"టైమర్‌లు, అలారంలు, భద్రతా సిస్టమ్‌లు, ఇతర యాప్‌ల నుంచి"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"అలారాలు"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"మీడియా శబ్దాలను ప్లే చేయి"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"మీడియా శబ్దాలు"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"వీడియోలు, గేమ్‌లు, ఇతర మీడియా నుంచి"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"మీడియా"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"తాకినప్పుడు ధ్వనులను అనుమతించు"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"తాకినప్పుడు ధ్వనులు"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"మీ కీ బోర్డ్, ఇతర బటన్‌ల నుంచి"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"తాకినప్పుడు ధ్వనులు"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"రిమైండర్‌లను అనుమతించు"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"రిమైండర్‌లు"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"టాస్క్‌లు, రిమైండర్‌ల నుంచి"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"రిమైండర్‌లు"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ఈవెంట్‌లను అనుమతించు"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ఈవెంట్‌లు"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"రానున్న క్యాలెండర్ ఈవెంట్‌ల నుంచి"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"భర్తీ చేయడానికి యాప్‌లను అనుమతించు"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"యాప్ మినహాయింపులు"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3915,6 +3931,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"ఇతర యాప్‌ల ఎగువన ప్రదర్శన"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"ఇతర యాప్‌ల ఎగువన కనిపించడానికి అనుమతించు"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"మీరు ఉపయోగించే ఇతర అనువర్తనాలలో ఎగువ భాగంలో కనిపించడం కోసం ఈ అనువర్తనాన్ని అనుమతించండి. మీరు ఆ అనువర్తనాలను ఉపయోగించే సమయంలో ఇది అంతరాయం కలిగించవచ్చు లేదా అవి కనిపించే లేదా ప్రవర్తించే తీరును మార్చవచ్చు."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"అన్ని ఫైల్‌లకు యాక్సెస్"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"అన్ని ఫైల్‌లను నిర్వహించడానికి అనుమతించండి"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"ఈ పరికరంలో, లేదా కనెక్ట్ చేయబడిన ఏవైనా నిల్వ వాల్యూమ్‌లలో, అన్ని ఫైల్‌లను చదవడానికి, మార్చడానికి, తొలగించడానికి ఈ యాప్‌నకు అనుమతిని ఇవ్వండి. అటువంటి అనుమతిని మీరు మంజూరు చేస్తే, మీకు ప్రత్యేకంగా తెలియపరచకుండానే మీ ఫైల్‌లను యాప్ యాక్సెస్ చేయవచ్చు."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"అన్ని ఫైల్‌లను యాక్సెస్ చేయగలవు"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr వర్చువల్ రియాలిటీ పరిశీలన స్టీరియో సహాయకం సేవ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"ఇతర యాప్‌ల పైన ప్రదర్శన"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> యాప్‌లు ఇతర యాప్‌ల ఎగువన కనిపించడానికి అనుమతించబడ్డాయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 063210f..23e8888 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ความเป็นส่วนตัว"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"ปิดใช้โดยผู้ดูแลระบบ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ไม่พร้อมใช้งาน"</string>
     <string name="security_status_title" msgid="6958004275337618656">"สถานะความปลอดภัย"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ล็อกหน้าจอ, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ล็อกหน้าจอ ลายนิ้วมือ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ต้องมีขั้นตอนการยืนยันทุกครั้งเมื่อใช้ Face Unlock ในแอป"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ลบข้อมูลใบหน้า"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ตั้งค่าปลดล็อกด้วยใบหน้า"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"ใช้ Face Unlock เพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน\n\nโปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณขณะที่คุณลืมตาอยู่\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ใช้ฟีเจอร์ปลดล็อกด้วยใบหน้าเพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน\n\nโปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณ\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ใช้ฟีเจอร์ปลดล็อกด้วยใบหน้าเพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน\n\nโปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณ แม้ว่าคุณจะหลับตาอยู่ก็ตาม\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ลบข้อมูลใบหน้าไหม"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ข้อมูลใบหน้าที่ใช้ในการปลดล็อกด้วยใบหน้าจะถูกลบออกอย่างถาวรและปลอดภัย หลังจากที่นำออกแล้ว คุณจะต้องใช้ PIN, รูปแบบ หรือรหัสผ่าน เพื่อปลดล็อกโทรศัพท์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ข้อมูลระบุตัวตน"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"ตัวตนที่ไม่ระบุชื่อ"</string>
     <string name="wifi_password" msgid="1458802324849513755">"รหัสผ่าน"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"ตัวระบุรหัสผ่าน SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"แสดงรหัสผ่าน"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"เลือกย่านความถี่ AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"อัตโนมัติ"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"กำลังแชร์ Wi‑Fi กับอุปกรณ์เครื่องนี้…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"กำลังเชื่อมต่อ…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"แชร์ฮอตสปอต"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"ยืนยันว่าเป็นคุณ"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"ยืนยันว่าเป็นคุณ"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"เปิด/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"จะไม่ปิดโดยอัตโนมัติ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"จะปิดโดยอัตโนมัติเมื่อพระอาทิตย์ขึ้น"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"ธีมมืดใช้สีดำที่มืดสนิทเพื่อช่วยให้แบตเตอรี่ของคุณใช้งานได้นานขึ้น ธีมมืดกำหนดเวลารอเปิดจนกระทั่งปิดหน้าจอ"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ธีมมืดใช้พื้นหลังสีดำเพื่อช่วยให้แบตเตอรี่ของคุณใช้งานได้นานขึ้นในหน้าจอบางรุ่น ธีมมืดจะกำหนดเวลารอในการเปิดหน้าจอไว้ก่อนที่จะดับลง"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ระยะหมดเวลาหน้าจอ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"เพื่อความปลอดภัย โปรดตั้งรูปแบบ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"ป้อนรหัสผ่านอีกครั้ง"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"ป้อนรหัสผ่านของโปรไฟล์งาน"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"ยืนยันรูปแบบของคุณ"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"ป้อนรูปแบบของโปรไฟล์งาน"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"ป้อน PIN อีกครั้ง"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"ป้อน PIN ของโปรไฟล์งาน"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"รหัสผ่านไม่ตรงกัน"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN ไม่ตรงกัน"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"ลากรูปแบบอีกครั้ง"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"โปรแกรมอ่านหน้าจอที่ใช้สำหรับคนตาบอดหรือผู้มีสายตาบกพร่อง"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"แตะรายการบนหน้าจอเพื่อฟังการอ่านออกเสียง"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ค่ากำหนดคำบรรยายวิดีโอ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"การขยาย"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"ขยาย"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"พื้นที่ในการขยาย"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"แสดงตัวควบคุมการย้าย"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"แสดงตัวควบคุมที่มีลักษณะคล้ายจอยสติ๊กเพื่อย้ายพื้นที่ในการขยาย"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"การตั้งค่าการขยาย"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ขยายโดยใช้ทางลัดและการแตะ 3 ครั้ง"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"เกี่ยวกับการขยาย"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"ตัวเลือก"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"ซูมเข้าบนหน้าจอ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"แตะ 3 ครั้งเพื่อซูม"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"แตะปุ่มเพื่อซูม"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"เลือกซิมการ์ด"</string>
     <string name="color_orange" msgid="216547825489739010">"ส้ม"</string>
     <string name="color_purple" msgid="6603701972079904843">"ม่วง"</string>
+    <string name="color_pink" msgid="8596872110888626708">"ชมพู"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ไม่ได้เสียบซิมการ์ด"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"สถานะซิม"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"สถานะซิม (ช่องซิม %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">เปิดใช้อยู่ 1 รายการ</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"เปิด \"ห้ามรบกวน\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"ข้อยกเว้น"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"บล็อกสิ่งรบกวนการมองเห็น"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"อนุญาตสัญญาณที่มองเห็น"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"เมื่อเปิดโหมดห้ามรบกวน"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"อนุญาตการรบกวนที่มีเสียง"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"จำกัดการแจ้งเตือน"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"ไม่มีเสียงเวลาแจ้งเตือน"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"คุณจะเห็นการแจ้งเตือนในหน้าจอ"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> กำหนดการเปิดได้โดยอัตโนมัติ</item>
       <item quantity="one">1 กำหนดการเปิดได้โดยอัตโนมัติ</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"ปิดเสียงอุปกรณ์ แต่อนุญาตข้อยกเว้น"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"ข้อยกเว้น"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"กำหนดเวลา"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"ดูข้อยกเว้นทั้งหมด"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"ยกเว้นเมื่อโหมดห้ามรบกวนเปิดอยู่"</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_schedule" msgid="2003707171924226212">"กำหนดการ"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"การแจ้งเตือนที่ปิดเสียงไว้"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"เมื่อเปิด \"ห้ามรบกวน\" ระบบเสียงและการสั่นจะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ปิดเสียงทั้งหมดยกเว้น"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"ปิดเสียงอยู่"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">อีก <xliff:g id="NUM_PEOPLE">%d</xliff:g> คน</item>
       <item quantity="one">อีก 1 คน</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"การสนทนา"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"อนุญาตข้อความ"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"ตรวจสอบว่าคุณตั้งค่าอุปกรณ์ให้ส่งเสียง สั่น หรือปิดเสียงไว้เพื่อให้แน่ใจว่าอุปกรณ์จะส่งเสียงเมื่อได้รับข้อความที่อนุญาต"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"บล็อกข้อความเข้าสำหรับ \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" เอาไว้ คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"ไม่มี"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"ไม่อนุญาตการโทรทั้งหมด"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"ไม่อนุญาตข้อความทั้งหมด"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"อนุญาตการปลุก"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"การปลุก"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"จากตัวจับเวลา การปลุก ระบบรักษาความปลอดภัย และแอปอื่นๆ"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"การปลุก"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"เปิดเสียงสื่อ"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"เสียงสื่อ"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"จากวิดีโอ เกม และสื่ออื่นๆ"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"สื่อ"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"อนุญาตเสียงแตะ"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"เสียงแตะ"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"จากแป้นพิมพ์และปุ่มอื่นๆ"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"เสียงแตะ"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"อนุญาตการช่วยเตือน"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"การช่วยเตือน"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"จากงานและการช่วยเตือน"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"ช่วยเตือน"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"อนุญาตกิจกรรม"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"กิจกรรม"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"จากกิจกรรมในปฏิทินที่กำลังจะเกิดขึ้น"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"อนุญาตให้แอปลบล้าง"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ข้อยกเว้นแอป"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"แสดงทับแอปอื่นๆ"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"อนุญาตให้แสดงทับแอปอื่นๆ"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"อนุญาตให้แอปนี้แสดงทับแอปอื่นๆ ที่คุณกำลังใช้อยู่ ซึ่งอาจรบกวนการใช้งานแอปเหล่านั้นหรือเปลี่ยนรูปลักษณ์หรือการทำงานตามที่ควรเป็น"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"การเข้าถึงไฟล์ทั้งหมด"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"อนุญาตให้เข้าถึงเพื่อจัดการไฟล์ทั้งหมด"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"อนุญาตให้แอปนี้อ่าน แก้ไข และลบไฟล์ทั้งหมดในอุปกรณ์นี้หรือวอลุ่มของพื้นที่เก็บข้อมูลใดๆ ที่เชื่อมต่อ หากได้รับอนุญาต แอปอาจเข้าถึงไฟล์ได้โดยที่คุณไม่ทราบอย่างชัดแจ้ง"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"เข้าถึงไฟล์ทั้งหมดได้"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR Virtual Reality Listener บริการตัวช่วยสเตอริโอ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"แสดงทับแอปอื่นๆ"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> จาก <xliff:g id="COUNT_1">%2$d</xliff:g> แอปได้รับอนุญาตให้แสดงทับแอปอื่นๆ"</string>
@@ -4277,7 +4297,7 @@
     <string name="instant_apps_settings" msgid="4280942494969957858">"ค่ากำหนดของ Instant Apps"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"แอปที่ติดตั้ง"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"ตัวจัดการพื้นที่เก็บข้อมูลกำลังจัดการพื้นที่เก็บข้อมูลของคุณ"</string>
-    <string name="account_for_section_header" msgid="7466759342105251096">"บัญชี - <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="account_for_section_header" msgid="7466759342105251096">"บัญชีสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"กำหนดค่า"</string>
     <string name="auto_sync_account_title" msgid="1458391453998755273">"ซิงค์ข้อมูลอัตโนมัติ"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"ซิงค์ข้อมูลส่วนบุคคลอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 553ad3f..08e64ad 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng storage ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng storage ng kredensyal"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacy"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Na-disable ng admin"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Hindi available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status ng seguridad"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Lock ng screen, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Lock ng screen, fingerprint"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kapag gumagamit ng face unlock sa app, laging humiling ng kumpirmasyon"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"I-delete: face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"I-set up ang face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad.\n\nTandaan:\nPuwedeng hindi sinasadyang ma-unlock ang telepono kapag tumingin ka rito.\n\nPuwedeng ma-unlock ng ibang tao ang telepono mo kung itatapat ito sa iyong mukha habang nakadilat ka.\n\nPuwedeng ma-unlock ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid, ang telepono mo."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad.\n\nTandaan:\nPuwedeng hindi sinasadyang ma-unlock ang telepono kapag tumingin ka rito.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad.\n\nTandaan:\nPuwedeng hindi sinasadyang ma-unlock ang telepono kapag tumingin ka rito.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo, kahit na nakapikit ka.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"I-delete ang data ng mukha?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Permanente at secure na made-delete ang face data na ginagamit ng face unlock. Pagkatapos nitong maalis, kakailanganin mo ang iyong PIN, pattern, o password para i-unlock ang telepono mo, mag-sign in sa mga app, at kumpirmahin ang mga pagbabayad."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Pagkakilanlan"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous na pagkakakilanlan"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Identifier ng password ng SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Ipakita ang password"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Pumili ng AP Band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Awtomatiko"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Ibinabahagi ang Wi‑Fi sa device na ito…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Kumokonekta…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Ibahagi ang hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"I-verify na ikaw ito"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"I-verify na ikaw ito"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Hindi awtomatikong mao-off kailanman"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Awtomatikong mao-off sa sunrise"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Gumagamit ng true black sa madilim na tema para makatulong na mas tumagal ang iyong baterya. Naghihintay ang mga iskedyul ng madilim na tema na ma-off ang iyong screen bago ma-on ang mga ito."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Gumagamit ng itim na background sa madilim na tema para makatulong na mas tumagal ang baterya sa ilang screen. Naghihintay ang mga iskedyul ng madilim na tema na ma-off ang iyong screen bago ma-on ang mga ito."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Timeout ng screen"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Para magamit ang fingerprint, i-set ang PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Para sa seguridad, magtakda ng pattern"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ilagay ulit ang iyong password"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ilagay ang iyong password sa trabaho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Kumpirmahin ang iyong pattern"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ilagay ang pattern sa trabaho"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ilagay ulit ang iyong PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ilagay ang iyong PIN sa trabaho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Hindi tugma ang mga password"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Hindi tugma ang mga PIN"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Iguhit ulit ang iyong pattern"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Screen reader na pangunahing nakalaan para sa mga taong bulag at malabo ang paningin"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Mag-tap ng mga item sa iyong screen upang marinig ang mga ito na binabasa nang malakas"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"I-magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Bahaging ima-magnify"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Ipakita ang controller ng paggalaw"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Magpakita ng controller na parang joystick para ilipat ang bahaging ima-magnify"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Mga setting ng pag-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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Mag-magnify gamit ang shortcut at pag-triple tap"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Tungkol sa I-magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Mga Opsyon"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Mag-zoom in sa screen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Mag-tap nang 3 beses upang mag-zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Mag-tap ng button upang mag-zoom"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Pumili ng SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Lila"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pink"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Walang nakalagay na mga SIM card"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Status ng SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Status ng SIM (slot ng sim %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ang naka-enable</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"I-on ang Huwag Istorbohin"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Mga Pagbubukod"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"I-block ang visual na abala"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Payagan ang visual na signal"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Kapag naka-on ang Huwag Istorbohin"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Payagan ang mga abalang tumutunog"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Paghigpitan ang mga notification"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Walang tunog mula sa mga notification"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Makikita mo ang mga notification sa iyong screen"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"I-mute ang device pero pahintulutan ang mga exception"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Mga Exception"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Iskedyul"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Tingnan ang lahat ng exception"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Mga pagbubukod kapag naka-on ang Huwag Istorbohin"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Mga Tao"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Mga App"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Mga alarm at iba pang abala"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Mga Iskedyul"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Mga pinatahimik na notification"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Kapag naka-on ang Huwag Istorbohin, mamu-mute ang tunog at pag-vibrate, maliban sa mga item na pinapayagan mo sa itaas."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"I-mute lahat maliban sa"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Na-mute"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Mga Pag-uusap"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Payagan ang mga mensahe"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Para matiyak na tumutunog ang mga pinapayagang mensahe, tingnan kung ang iyong device ay nakatakdang mag-ring, mag-vibrate, o silent."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Wala"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Huwag magpahintulot ng anumang tawag"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Huwag magpahintulot ng anumang mensahe"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Payagan ang mga alarm"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Mga Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Mula sa mga timer, alarm, system ng seguridad, at iba pang app"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"mga alarm"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"I-play ang mga tunog ng media"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Mga tunog ng media"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Mula sa mga video, laro, at iba pang media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Payagan ang mga tunog sa pagpindot"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Mga tunog sa pagpindot"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Mula sa iyong keyboard at iba pang button"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"mga tunog sa pagpindot"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Payagan ang mga paalala"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Mga Paalala"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Mula sa mga gawain at paalala"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"mga paalala"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Payagan ang mga event"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Mga Event"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Mula sa mga paparating na event sa kalendaryo"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Payagan ang mga app na mag-override"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Mga exception na app"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Ipakita sa ibabaw ng ibang app"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Payagang ipakita sa ibabaw ng iba pang app"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Payagan ang app na ito na lumabas sa ibabaw ng iba pang ginagamit mong app. Posible itong makaapekto sa iyong paggamit ng mga naturang app, o sa hitsura o paggana ng mga ito."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Access sa lahat ng file"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Payagan para mapamahalaan ang lahat ng file"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Payagan ang app na ito na basahin, baguhin, at i-delete ang lahat ng file sa device na ito o sa anumang nakakonektang storage volume. Kung pagbibigyan ito, puwedeng mag-access ng mga file ang app nang hindi mo nalalaman."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Makaka-access sa lahat ng file"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reality listener stereo pantulong serbisyo"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Ipakita sa ibabaw ng ibang app"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Pinapayagan ang <xliff:g id="COUNT_0">%1$d</xliff:g> sa <xliff:g id="COUNT_1">%2$d</xliff:g> (na) app na lumabas sa ibabaw ng ibang app"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4025b50..9135c93 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Gizlilik"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Yönetici devre dışı bıraktı"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Kullanılamıyor"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Güvenlik durumu"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, yüz tanıma kilidi"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, parmak izi"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uygulamalarda yüz tanıma kilidi kullanırken daima onay adımı gerektir."</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Yüz verilerini sil"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Yüz tanıma kilidini kur"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Cihazınızın kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın.\n\nDikkat edilecek noktalar:\nTelefona bakarsanız, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nTelefonunuz, gözleriniz açıkken yüzünüzün hizasına kaldırılırsa telefonunuzun kilidi başka biri tarafından da açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Cihazınızın kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın.\n\nDikkat edilecek noktalar:\nTelefona baktığınızda, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nTelefonunuz başka birisi tarafından yüzünüze tutulduğunda kilidi açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Cihazınızın kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın.\n\nDikkat edilecek noktalar:\nTelefona bakarsanız, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nGözleriniz kapalıyken bile yüzünüzün hizasına tutulduğunda, telefonunuzun kilidi başka biri tarafından açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Yüz verileri silinsin mi?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Yüz tanıma kilidi tarafından kullanılan yüz verileri kalıcı ve güvenli bir şekilde silinecek. Kaldırma işleminden sonra, telefonunuzun kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için PIN, desen veya şifrenize ihtiyacınız olur."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Kimlik"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonim kimlik"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Şifre"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE şifre tanımlayıcı"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Şifreyi göster"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Erişim Noktası Bandı Seçin"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Otomatik"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Bu cihazla kablosuz bağlantı paylaşılıyor…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Bağlanıyor…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspot\'u paylaş"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Siz olduğunuzu doğrulayın"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Bu kişinin siz olduğunu doğrulayın"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"hiçbir zaman otomatik olarak kapatılmayacak"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Güneş doğduğunda otomatik olarak kapatılacak"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Koyu tema özelliği, pilinizin daha uzun süre dayanmasını sağlamak için gerçek siyah kullanır. Koyu tema, açılmak için ekranınızın kapanmasını beklemeye programlanır."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Koyu tema özelliği, pilinizin daha uzun süre dayanmasını sağlamak için bazı ekranlarda siyah kullanır. Koyu tema, açılmak için ekranınızın kapanmasını beklemeye programlanır."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekran zaman aşımı"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Parmak izi için PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Güvenlik için desen oluşturun"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Şifrenizi yeniden girin"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"İş şifrenizi girin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Deseninizi onaylayın"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"İş deseninizi girin"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN\'inizi yeniden girin"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"İş PIN\'inizi girin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Şifreler eşleşmiyor"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN\'ler eşleşmiyor"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Deseninizi tekrar çizin"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Özellikle görme engelliler ve gözleri az görenler için tasarlanmış bir ekran okuyucu"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Sesli okunması için ekranınızdaki öğelere dokunun"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Büyüt"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Büyütme alanı"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Taşıma kumandalarını gösterme"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Büyütme alanını taşımak için kontrol çubuğu benzeri bir kumanda gösterme"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Büyütme ayarları"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Kısayolla ve üç kez dokunarak büyütme"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Büyütme hakkında"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Seçenekler"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ekranı yakınlaştırın"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Yakınlaştırmak için 3 defa dokunun"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Yakınlaştırmak için bir düğmeye dokunun"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM kart seçin"</string>
     <string name="color_orange" msgid="216547825489739010">"Turuncu"</string>
     <string name="color_purple" msgid="6603701972079904843">"Mor"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pembe"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM kart takılı değil"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM durumu"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM durumu (SIM yuvası %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">1 kural etkin</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Rahatsız Etmeyin\'i açın"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"İstisnalar"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Görsel bildirimleri engelle"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Görsel sinyallere izin ver"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Rahatsız Etmeyin ayarı açık olduğunda"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Ses çıkaran kesintilere izin ver"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Bildirimleri kısıtla"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirimlerden sesli uyarı yok"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Bildirimleri ekranınızda göreceksiniz"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Cihazın sesini kapat, ancak istisnalara izin ver"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"İstisnalar"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Program"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Tüm istisnaları göster"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Rahatsız Etmeyin ayarı açıkken istisnalar"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Kişiler"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Uygulamalar"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmlar ve diğer kesintiler"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Programlar"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Sessize alınmış bildirimler"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Rahatsız Etmeyin ayarı açık olduğunda ses ve titreşim kapatılır (yukarıda izin verdiğiniz öğeler hariç)."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Şu öğe hariç hepsinin sesini kapat:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Ses kapatıldı"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Görüşmeler"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Mesajlara izin ver"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"İzin verilen mesajların ses çıkardığından emin olmak için cihazınızın çalmaya mı titreşime mi yoksa sessize mi ayarlandığını kontrol edin."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Hiçbiri"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Aramalara izin verme"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Mesajlara izin verme"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Alarmlara izin ver"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarmlar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Zamanlayıcılar, alarmlar, güvenlik sistemleri ve diğer uygulamalardan"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarmlar"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Medya seslerini çal"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Medya sesleri"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Videolar, oyunlar ve diğer medyalardan"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"medya"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Dokunma seslerine izin ver"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Dokunma sesleri"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Klavyeniz ve diğer düğmelerden"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"dokunma sesleri"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Hatırlatıcılara izin ver"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Hatırlatıcılar"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Görevler ve hatırlatıcılardan"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"hatırlatıcılar"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Etkinliklere izin ver"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Etkinlikler"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Yaklaşan takvim etkinliklerinden"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Uygulamaların geçersiz kılmasına izin ver"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Uygulama istisnaları"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Diğer uygulamaların üzerinde göster"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Diğer uyg. üzerinde gösterime izin ver"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Bu uygulamaya, kullandığınız diğer uygulamaların üzerinde gösterme izin verir. Bu durum, diğer uygulamaların kullanımını etkileyebilir veya görünüşünü ya da davranışını değiştirebilir."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Tüm dosyalara erişim"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Tüm dosyaları yönetme erişimine izin ver"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Bu uygulamanın, bu cihazdaki veya cihaza bağlı depolama birimlerindeki tüm dosyaları okumasına, değiştirmesine ve silmesine izin verin İzin verilirse uygulama size açıkça bildirmeden dosyalara erişebilir."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Tüm dosyalara erişebilir"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr sanal gerçeklik dinleyici stereo yardımcı hizmeti"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Diğer uyg. üzerinde göster"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> uyg. diğer uyg. üzerinde gösterilmesine izin veriliyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b0226eb..4566d56 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -319,7 +319,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Конфіденційність"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Вимкнено адміністратором"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Недоступно"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Статус безпеки"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокування екрана, фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокування екрана, відбиток пальця"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Просити підтвердження під час використання Фейсконтролю в додатках"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Видалити дані про обличчя"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Налаштувати Фейсконтроль"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Використовуйте Фейсконтроль, щоб розблоковувати пристрій, входити в додатки й підтверджувати платежі.\n\nВажливо\nТелефон можна розблокувати поглядом випадково.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, коли у вас відкриті очі.\n\nТелефон може розблокувати людина, схожа на вас, зокрема ваш близнюк."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Використовуйте фейсконтроль, щоб розблоковувати пристрій, входити в додатки й підтверджувати платежі.\n\nУвага!\nВи можете випадково розблокувати телефон у недоречний момент, ненароком поглянувши на нього.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя.\n\nТелефон може розблокувати людина, схожа на вас, наприклад ваш близнюк."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"З функцією фейсконтролю можна розблоковувати пристрій, входити в додатки й підтверджувати платежі.\n\nЗверніть увагу:\nпоглянувши на телефон, ви можете випадково розблокувати його в недоречний момент.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, навіть коли у вас закриті очі.\n\nТелефон може розблокувати людина, схожа на вас, наприклад, ваш близнюк."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Видалити дані про обличчя?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Дані про обличчя, потрібні для фейсконтролю, буде остаточно видалено без можливості відновлення. Після цього потрібно буде вводити PIN-код, ключ або пароль, щоб розблоковувати телефон, входити в додатки й підтверджувати платежі."</string>
@@ -911,7 +911,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Ідентифік."</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Анонімна ідентиф-ція"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Пароль"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Ідентифікатор пароля SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Показати пароль"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Виберіть діапазон частот точки доступу"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автоматично"</string>
@@ -952,9 +951,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Цьому пристрою надається доступ до Wi‑Fi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"З’єднання…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Поділіться точкою доступу"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Підтвердьте, що це ви"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Підтвердьте, що це ви"</string>
     <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" 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>
@@ -1266,7 +1267,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Не вимкнеться автоматично"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Вимкнеться автоматично на світанку"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Щоб економити заряд акумулятора, у темній темі використовується чорний колір без півтонів. За допомогою розкладу ви можете налаштувати, коли вмикатиметься темна тема."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Щоб економити заряд акумулятора, у темній темі використовується чорний фон. Її буде ввімкнено, доки ви не вимкнете екран."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Час вимкнення екрана"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Вимикати екран"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -1758,8 +1759,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Щоб користуватися відбитком пальця, налаштуйте PIN-код"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"З міркувань безпеки налаштуйте ключ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Введіть пароль ще раз"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Введіть пароль робочого профілю"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Підтвердьте ключ розблокування"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Введіть ключ робочого профілю"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Введіть PIN-код ще раз"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Введіть PIN-код робочого профілю"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Паролі не збігаються"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-коди не збігаються"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Намалюйте ключ ще раз"</string>
@@ -2097,20 +2101,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Програма зчитування з екрана для людей, які не бачать або мають слабкий зір"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Щоб почути назву елемента на екрані, торкніться його"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налаштування субтитрів"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Збільшення"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Збільшення"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область збільшення"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Показати інструмент для переміщення"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Показати джойстик для переміщення області збільшення"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Параметри збільшення"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Збільшувати кнопкою й потрійним дотиком"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Про функцію збільшення"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Параметри"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Наблизити екран"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Тричі торкніться, щоб збільшити"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Торкніться кнопки, щоб збільшити вміст"</string>
@@ -3168,6 +3174,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Вибрати SIM-карту"</string>
     <string name="color_orange" msgid="216547825489739010">"Оранжевий"</string>
     <string name="color_purple" msgid="6603701972079904843">"Пурпуровий"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Рожевий"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM-карту не вставлено"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Статус SIM-карти"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Статус SIM-карти (гніздо %1$d для SIM-карти)"</string>
@@ -3334,6 +3341,7 @@
       <item quantity="other">Увімкнено: <xliff:g id="ON_COUNT">%d</xliff:g></item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Увімкнути режим \"Не турбувати\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Винятки"</string>
@@ -3360,7 +3368,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокувати візуальні сповіщення"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволити візуальні сигнали"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Коли ввімкнено режим \"Не турбувати\""</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Дозволити сповіщення зі звуком"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Обмежити сповіщення"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Вимкнути звук сповіщень"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Ви бачитимете сповіщення на екрані"</string>
@@ -3425,10 +3433,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Вимкнути звук на пристрої, крім винятків"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Винятки"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Графік"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Показати всі винятки"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Винятки під час роботи режиму \"Не турбувати\""</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_schedule" msgid="2003707171924226212">"Графіки"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Сповіщення, для яких вимкнено звук"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"У режимі \"Не турбувати\" звук і вібрація вимикатиметься для всіх сигналів, окрім дозволених вище."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Вимкнути звук для всього, винятки:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Без звуку"</string>
@@ -3702,6 +3712,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Чати"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Дозволити повідомлення"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Те, чи надходитимуть дозволені повідомлення зі звуком, залежить від вибраного на телефоні режиму (дзвінок, вібрація чи без звуку)."</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>: вхідні повідомлення блокуються. Ви можете змінити налаштування, щоб друзі, члени сім’ї й інші контакти зв’язувалися з вами."</string>
@@ -3715,15 +3726,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Немає"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Заборонити дзвінки"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Заборонити повідомлення"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Дозволити будильники"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Будильник"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"З таймерів, будильників, систем безпеки й інших додатків"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"сигнали будильників"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Відтворювати звуки медіа"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Звуки з відео"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"З відео, ігор та інших медіафайлів"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"медіа-вміст"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Дозволити звуки під час дотику"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Звуки під час дотику"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"З клавіатури й інших кнопок"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"звуки під час дотику"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Дозволити нагадування"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Нагадування"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Із завдань і нагадувань"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"нагадування"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Дозволити події"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Події"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"З майбутніх подій календаря"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволити додаткам замінювати режим \"Не турбувати\""</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Винятки для додатків"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -4041,6 +4057,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Показувати поверх інших додатків"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Показувати поверх інших додатків"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Дозволити цьому додатку відображатися поверх інших відкритих додатків. Він може заважати користуватись іншими додатками або змінювати їх вигляд чи поведінку."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Доступ до всіх файлів"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Надати доступ до керування всіма файлами"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Дозволити цьому додатку переглядати, змінювати та видаляти всі файли на цьому пристрої або інших підключених носіях пам\'яті. Після надання дозволу додаток може отримувати доступ до файлів без вашого відома."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Мають доступ до всіх файлів"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr віртуальна реальність стерео допоміжний сервіс"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Показувати поверх додатків"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"Додатки, які можуть відображатися поверх інших додатків: <xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 7fe57ab..a2453cb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"رازداری"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"منتظم کی طرف سے غیر فعال کردہ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"دستیاب نہیں ہے"</string>
     <string name="security_status_title" msgid="6958004275337618656">"سیکیورٹی کی صورتحال"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"اسکرین لاک، چہرے کے ذریعے غیر مقفل کرنا"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"اسکرین لاک، فنگر پرنٹ"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ایپس میں چہرے کے ذریعے غیر مقفل استعمال کرتے وقت، ہمیشہ تصدیق طلب کریں"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"چہرے کا ڈیٹا حذف کریں"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"چہرے کے ذریعے غیر مقفل کرنے کو ترتیب دیں"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کے لیے چہرے کے ذریعے غیر مقفل کرنے کا استعمال کریں۔\n\nذہن میں رکھیں:\nجب آپ کا ارادہ نہ ہو تو فون پر دیکھتے ہوئے اسے غیر مقفل کر سکتے ہیں۔\n\nآپ کی آنکھیں کھلی ہونے پر کوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ کی طرح بہت زيادہ نظر آنے والے کسی بھی شخص، جیسے آپ کے بھائی بہن کے ذریعے آپ کا فون غیر مقفل کیا جا سکتا ہے۔"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کے لیے چہرے کے ذریعے غیر مقفل کرنے کا استعمال کریں۔\n\nذہن میں رکھیں:\nجب آپ کا ارادہ نہ ہو تو فون کو دیکھنا اسے غیر مقفل کر سکتا ہے۔\n\nکوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ کی طرح بہت زيادہ نظر آنے والے کسی بھی شخص، جیسے، آپ کے بھائی بہن کے ذریعے آپ کا فون غیر مقفل کیا جا سکتا ہے۔"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کیلئے \'چہرے کے ذریعے غیر مقفل کرنے\' کا استعمال کریں۔\n\nیاد رکھیں:\nجب آپ کا ارادہ نہ بھی ہو تب بھی فون پر دیکھنے سے وہ غیر مقفل ہو سکتا ہے۔\n\nآپ کی آنکھیں بند ہونے پر بھی، کوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ سے بہت زیادہ مشابہ کوئی بھی شخص، جیسے کوئی ہم شکل بھائی بہن، آپ کے فون کو غیر مقفل کر سکتا ہے۔"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"چہرے کا ڈیٹا حذف کریں؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"‏چہرے کے ذریعے غیر مقفل کرنے کی خصوصیت کے ذریعے استعمال کردہ چہرے کے ڈیٹا کو مکمل طور پر اور محفوظ طریقے سے حذف کر دیا جائے گا۔ ہٹانے کے بعد، آپ کو اپنا فون غیر مقفل کرنے، ایپس میں سائن ان کرنے اور ادائیگیوں کی تصدیق کرنے کے لیے اپنا PIN، پیٹرن یا پاس ورڈ درکار ہوگا۔"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"شناخت"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"گمنام شناخت"</string>
     <string name="wifi_password" msgid="1458802324849513755">"پاس ورڈ"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"‏SAE پاسورڈ شناخت کار"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"پاس ورڈ دکھائیں"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"‏AP بینڈ منتخب کریں"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"خودکار"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"‏اس آلہ کے ساتھ Wi‑Fi کا اشتراک کیا جا رہا ہے…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"منسلک ہو رہا ہے…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"ہاٹ اسپاٹ کا اشتراک کریں"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"توثیق کریں کہ یہ آپ ہیں"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"یہ آپ ہی ہیں اس بات کی تصدیق کریں"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"کبھی بھی خودکار طور پر آف نہیں ہو گی"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"طلوع آفتاب پر خودکار طور پر آف ہو جائے گی"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"گہری تھیم آپ کی بیٹری کو زیادہ دیر تک فعال رکھنے میں مدد کے ليے حقیقی سیاہ رنگ استعمال کرتی ہے۔ گہری تھیم کے شیڈولز آپ کی اسکرین کے آف ہونے پر آن ہونے کا انتظار کرتے ہیں۔"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"گہری تھیم کچھ اسکرینز پر بیٹری کو زیادہ دیر تک فعال رکھنے میں مدد کے لیے سیاہ پس منظر استعمال کرتی ہے۔ گہری تھیم کے شیڈولز آپ کی اسکرین کے آف ہونے پر آن ہونے کا انتظار کرتے ہیں۔"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"اسکرین ٹائم آؤٹ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"اسکرین آف ہوجاتی ہے"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"سیکیورٹی کیلئے، پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"اپنا پاس ورڈ دوبارہ درج کریں"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"اپنا دفتری پاس ورڈ درج کریں"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"اپنے پیٹرن کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"اپنا دفتری پیٹرن درج کریں"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"‏اپنا PIN دوبارہ درج کریں"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"‏اپنا دفتری PIN درج کریں"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"پاس ورڈز مماثل نہیں ہیں"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"‏PINs مماثل نہیں ہیں"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"اپنا پیٹرن دوبارہ ڈرا کریں"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"سکرین قاری بنیادی طور پر اندھے پن اور کم بصارت والے لوگوں کیلئے ہے"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"آئٹمز کو بہ آواز بلند پڑھتے ہوئے سننے کیلئے اپنی اسکرین پر ان آئٹمز کو تھپتھپائیں"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"کیپشن کی ترجیحات"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"میگنیفکیشن"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"بڑا کریں"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"میگنیفکیشن کی جگہ"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"کنٹرولر منتقل کریں کو دکھائیں"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"میگنیفکیشن کی جگہ منتقل کرنے کے لیے جوائے اسٹک جیسا کنٹرولر دکھائیں"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"ترتیبات کو بڑا کریں"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"شارٹ کٹ اور تین بار تھپتھپانے سے بڑا کریں"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"بڑا کرنے کے بارے میں"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"اختیارات"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"اسکرین پر زوم ان کریں"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"زوم کرنے کیلئے 3 بار تھپتھپائیں"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"زوم کرنے کیلئے ایک بٹن پر تھپتھپائیں"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"‏SIM کارڈ منتخب کریں"</string>
     <string name="color_orange" msgid="216547825489739010">"نارنجی"</string>
     <string name="color_purple" msgid="6603701972079904843">"جامنی"</string>
+    <string name="color_pink" msgid="8596872110888626708">"گلابی"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"‏کوئی SIM کارڈز داخل نہیں کیے گئے"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"‏SIM کا اسٹیٹس"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"‏SIM اسٹیٹس (sim سلاٹ ‎%1$d)‎"</string>
@@ -3244,6 +3251,8 @@
       <item quantity="one">1 فعال ہے</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ڈسٹرب نہ کریں"</string>
+    <!-- no translation found for zen_mode_settings_summary (6040862775514495191) -->
+    <skip />
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"مداخلتوں کی حد مقرر کریں"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ڈسٹرب نہ کریں\' کو آن کریں"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"مستثنیات"</string>
@@ -3270,7 +3279,8 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"بصری مداخلتیں مسدود کریں"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"بصری سگنلز کی اجازت دیں"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"جب \'ڈسٹرب نہ کریں\' آن ہو"</string>
+    <!-- no translation found for zen_mode_settings_category (3794956668816783447) -->
+    <skip />
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"اطلاعات پر پابندی لگائیں"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"اطلاعات کی کوئی آواز نہیں"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"آپ کو اپنی اسکرین پر اطلاعات نظر آئیں گی"</string>
@@ -3331,10 +3341,18 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> شیڈولز خود بخود آن ہو سکتے ہیں</item>
       <item quantity="one">1 شیڈول خود بخود آن ہو سکتا ہے</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"آلہ کو خاموش کریں لیکن مستثنیات کی اجازت دیں"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"مستثنیات"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"شیڈول"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"سبھی مستثنیات دیکھیں"</string>
+    <!-- no translation found for zen_category_behavior (9188445582469977640) -->
+    <skip />
+    <!-- no translation found for zen_category_people (8252926021894933047) -->
+    <skip />
+    <!-- no translation found for zen_category_apps (1167374545618451925) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (1316097981052752811) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (2003707171924226212) -->
+    <skip />
+    <!-- no translation found for zen_category_visuals (2875037337125038831) -->
+    <skip />
     <string name="zen_sound_footer" msgid="4090291351903631977">"\'ڈسٹرب نہ کریں\' آن ہونے پر، آواز اور وائبریشن کو خاموش کر دیا جائے گا، ماسوا ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"ان کے سوا تمام خاموش کریں"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"خاموش کردہ"</string>
@@ -3594,6 +3612,8 @@
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> دیگر</item>
       <item quantity="one">1 دیگر</item>
     </plurals>
+    <!-- no translation found for zen_mode_conversations_title (5491912973456026379) -->
+    <skip />
     <string name="zen_mode_messages" msgid="7835537207069585861">"پیغامات کی اجازت دیں"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"اجازت یافتہ پیغامات کے آواز کرنے کو یقینی بنانے کیلئے، چیک کریں کہ آیا آپ کا آلہ رِنگ، وائبریٹ یا خاموش پر سیٹ ہے۔"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ کے لیے آنے والے پیغامات مسدود ہیں۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کے لیے، آپ ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
@@ -3607,15 +3627,26 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"کوئی نہیں"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"کسی کال کی اجازت نہ دیں"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"کسی پیغام کی اجازت نہ دیں"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"الارمز کی اجازت دیں"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"الارمز"</string>
+    <!-- no translation found for zen_mode_alarms_summary (3388679177457223967) -->
+    <skip />
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"الارمز"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"میڈیا کی آوازیں چلائیں"</string>
+    <!-- no translation found for zen_mode_media (885017672250984735) -->
+    <skip />
+    <!-- no translation found for zen_mode_media_summary (3052407079117545815) -->
+    <skip />
     <string name="zen_mode_media_list" msgid="2006413476596092020">"میڈیا"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"ٹچ کی آوازوں کی اجازت دیں"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"ٹچ کی آوازیں"</string>
+    <!-- no translation found for zen_mode_system_summary (7905531918458452765) -->
+    <skip />
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ٹچ کی آوازیں"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"یاددہانیوں کی اجازت دیں"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"یاد دہانیاں"</string>
+    <!-- no translation found for zen_mode_reminders_summary (3961627037429412382) -->
+    <skip />
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"یاددہانیاں"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"ایونٹس کی اجازت دیں"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"ایونٹس"</string>
+    <!-- no translation found for zen_mode_events_summary (3241903481309766428) -->
+    <skip />
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ایپس کو اوور رائیڈ کرنے کی اجازت دیں"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"ایپ کے مستثنیات"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3911,6 +3942,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"دیگر ایپس پر ڈسپلے کریں"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"دیگر ایپس پر ڈسپلے کی اجازت دیں"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"اپنی زیر استعمال دیگر ایپس کے اوپر اس ایپ کو ڈسپلے ہونے کی اجازت دیں۔ یہ آپ کی ان ایپس کے استعمال میں مداخلت کر سکتی ہے یا وہ جس طرح دکھائی دیتی یا برتاؤ کرتی دکھائی دیتی ہیں، اس میں تبدیلی کر سکتی ہے۔"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"سبھی فائلز کی رسائی"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"سبھی فائلز کا نظم کرنے کیلئے رسائی کی اجازت دیں"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"اس ایپ کو اس آلہ یا کسی منسلک اسٹوریج والیوم کی تمام فائلز کو پڑھنے، بڑا کرنے اور حذف کرنے کی اجازت دیں۔ اگر اجازت دی گئی تو، ایپ آپ کی صَرِيح معلومات کے بغیر فائلز تک رسائی حاصل کر سکتی ہے۔"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"سبھی فائلز تک رسائی حاصل کی جا سکتی ہے"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"‏vr ورچوئل رئیلٹی سامع اسٹیریو مددگار سروس"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"دیگر ایپس پر ڈسپلے کریں"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> میں سے <xliff:g id="COUNT_0">%1$d</xliff:g> ایپس کو دیگر ایپس پر دکھانے کی اجازت ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 73dc031..f4ffc8f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Maxfiylik"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Administrator tomonidan o‘chirilgan"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Mavjud emas"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Xavfsizlik holati"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran qulfi, qulfni yuzni tanitib ochish"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran qulfi, barmoq izi"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ilovalar yuz bilan ochilishida har doim tasdiqlanishi kerak"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Yuz unutilsinmi?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Yuz bilan ochishni sozlang"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Qulfni ochishda, ilovalarga kirishda va xaridlarni tasdiqlashda Yuz bilan ochish funksiyasidan foydalaning.\n\nDiqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nBegonalar telefoningizni yumilmagan koʻzlaringizga qaratish orqali ham qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Qulfni ochishda, ilovalarga kirishda va xaridlarni tasdiqlashda Yuz bilan ochish funksiyasidan foydalaning.\n\nDiqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nBegonalar telefoningizni yuzingizga qaratib ham qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Qulfni ochishda, ilovalarga kirishda va xaridlarni tasdiqlashda Yuz bilan ochish funksiyasidan foydalaning.\n\nDiqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nKoʻzlaringiz yumilganda ham begonalar telefoningizni yuzingizga qaratish orqali qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Yuzga oid axborot oʻchirib tashlansinmi?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Yuz bilan ochish funksiyasi tomonidan yozib olingan yuz axboroti butunlay va xavfsiz tarzda olib tashlanadi. Tozalanganidan keyin telefonni ochish, ilovalarga kirish va toʻlovlarni tasdiqlash uchun PIN kod, grafik kalit yoki parol zarur."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Nom"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonim nom"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Parol"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE parol identifikatori"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Parol berkitilmasin"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Wi-Fi chastotalari diapazoni"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Avtomatik"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi bu qurilma bilan ulashilmoqda…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Ulanmoqda…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Hotspotni ulashish"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Bu siz ekaningizni isbotlang"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Oʻzingiz ekanligingizni tasdiqlang"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Hech qachon avtomatik faolsizlantirilmaydi"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Quyosh chiqishi bilan avtomatik tugaydi"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Tungi mavzuda ekran asl qora tusga kiradi va batareya sarfi tejaladi. Bundan tashqari, tungi mavzuning qachon yoqilishi va oʻchirilishini ham sozlay olasiz."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Tungi mavzuda ayrim ekranlar asl qora tusga kiradi va batareya sarfi tejaladi. Agar telefonni ishlatayotgan vaqtingizda tungi rejimning yonish vaqti kelib qolsa, u ekran keyingi safar yonganida ishga tushadi."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekranning kutish vaqti"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan keyin"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Grafik kalit yarating"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Parolni qayta kiriting"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ishchi profilingiz parolini kiriting"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Grafik kalitni tasdiqlang"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ishchi profilingizning chizmali kalitini kiriting"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"PIN kodni qayta kiriting"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ishchi profilingizning PIN kodini kiriting"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Parol mos kelmadi"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-kod mos kelmadi"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Grafik kalitni yana bir marta chizing"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Ko‘r va ko‘rish qobiliyati past odamlar uchun ekrandan o‘qish vositasi"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Ekrandagi elementlarni o‘qib eshittirish uchun ularning ustiga bosing"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Taglavha sozlamalari"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Kattalashtirish"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"Kattalashtirish"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kattalashtiriladigan hudud"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Navigatsiya pultini chiqarish"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Kattalashtiriladigan hududda joystik kabi navigatsiya pulti chiqsin"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Kattalashtirish sozlamalari"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Tugma va uch marta bosish bilan kattalashtirish"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Kattalashtirish haqida"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Parametrlar"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Ekranda kattalashtirish"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"3 marta bosib masshtabni o‘zgartirish"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Kattalashtirish uchun tugmani bosing"</string>
@@ -3094,6 +3100,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"SIM kartani tanlang"</string>
     <string name="color_orange" msgid="216547825489739010">"To‘q sariq"</string>
     <string name="color_purple" msgid="6603701972079904843">"Binafsharang"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Pushti"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIM karta solinmagan"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM karta holati"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM karta holati (%1$d-SIM uyasi)"</string>
@@ -3256,6 +3263,7 @@
       <item quantity="one">1 ta yoqilgan</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Bezovta qilinmasin rejimini yoqing"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Istisnolar"</string>
@@ -3282,7 +3290,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vizual bildirishnomalarni bloklash"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizual signallarga ruxsat"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Bezovta qilinmasin rejimida"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Tovush chiqarib bezovta qilishlarga ruxsat berish"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Bildirishnoma cheklovlari"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirishnomalar tovushsiz keladi"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Bildirishnomalar ekranga chiqariladi"</string>
@@ -3343,10 +3351,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Tovushsiz (istisnolardan tashqari)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Istisnolar"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Jadval"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Barcha istisnolar"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Bezovta qilinmasin rejimidan istisnolar"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Odamlar"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Ilovalar"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Signallar va boshqa bezovta qilishlar"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Rejalar"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Ovozsiz bildirishnomalar"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Bezovta qilinmasin rejimida, yuqorida ruxsat berilganlardan tashqari, tovush va tebranishlar ovozsiz qilinadi."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Hammasini ovozsiz qilish, faqat bular mustasno:"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Ovozsiz"</string>
@@ -3606,6 +3616,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Suhbatlar"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Xabarlar qabuliga ruxsat berish"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Muhim xabarlarni oʻtkazib yubormaslik uchun qurilmangizda tovushli signal yoki tebranish xususiyati yoqilganini tekshiring."</string>
     <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>
@@ -3619,15 +3630,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Hech kimdan"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Barcha chaqiruvlarni taqiqlash"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Barcha xabarlarni taqiqlash"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Signallar"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Signallar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Taymerlar, signallar, xavfsizlik tizimlari va boshqa ilovalardan"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"signallar"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Multimedia tovushlari"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Media tovushlar"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Videolar, oʻyinlar va boshqa media ilovalardan"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Sensor tovushlari"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Ekranga bosilgandagi tovush"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Klaviatura va boshqa tugmalardan"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"ekranga bosilgandagi tovush"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Eslatmalar"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Eslatmalar"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Vazifa va eslatmalardan"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"eslatmalar"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Tadbirlar"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Tadbirlar"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Kelgusi taqvim tadbirlaridan"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Ilovalarga Bezovta qilinmasin rejimiga amal qilmasligiga ruxsat berish"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Ilova istisnolari"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3927,6 +3943,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Interfeys elementlarini boshqa oynalar ustidan ochishga ruxsat beradi. Bu funksiya ilovalar bilan ishlashingizga xalaqit qilishi yoki ularning interfeysini buzib tashlashi mumkin."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Barcha fayllarga ruxsat"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Barcha fayllarni boshqarishga ruxsat berish"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Bu ilovaga mazkur qurilmadagi yoki ulangan xotira qurilmalaridagi barcha fayllarni oʻqish, tahrirlash va oʻchirib tashlash uchun ruxsat beriladi. Ruxsat berilgandan keyin ilova fayllardan sizning xabaringizsiz foydalana oladi."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Barcha fayllarga ruxsati bor ilova"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual borliq tinglovchi stereo yordamchi xizmat"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> ta ilova boshqa oynalar ustidan ochilishi mumkin (jami: <xliff:g id="COUNT_1">%2$d</xliff:g>)"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f6813b4..8b9b54a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Bảo mật"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Bị quản trị viên vô hiệu hóa"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Chưa có"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Trạng thái bảo mật"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Phương thức khóa màn hình, mở khóa bằng khuôn mặt"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Phương thức khóa màn hình, vân tay"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Luôn yêu cầu xác nhận khi dùng mở khóa bằng khuôn mặt trong ứng dụng"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Xóa dữ liệu khuôn mặt"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Thiết lập mở khóa bằng khuôn mặt"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận thanh toán.\n\nLưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa điện thoại khi họ giơ điện thoại trước mặt bạn khi bạn đang mở mắt.\n\nNhững người có diện mạo giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận thanh toán.\n\nLưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa điện thoại khi họ giơ điện thoại lên trước mặt bạn.\n\nNhững người có khuôn mặt rất giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại này."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận thanh toán.\n\nLưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa bằng cách giơ điện thoại lên trước mặt bạn, kể cả khi bạn đang nhắm mắt.\n\nNhững người có diện mạo giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Bạn muốn xóa dữ liệu khuôn mặt?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Dữ liệu khuôn mặt mà tính năng mở khóa bằng khuôn mặt sử dụng sẽ bị xóa vĩnh viễn một cách an toàn. Sau khi xóa, bạn phải có mã PIN, hình mở khóa hoặc mật khẩu để mở khóa điện thoại, đăng nhập vào ứng dụng và xác nhận thanh toán."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Nhận dạng"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Danh tính ẩn danh"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Mật khẩu"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Mã nhận dạng mật khẩu SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Hiển thị mật khẩu"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Chọn băng tần AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Tự động"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Chia sẻ Wi‑Fi với thiết bị này…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Đang kết nối…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Chia sẻ điểm phát sóng"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Xác minh đó là bạn"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Xác minh rằng đó là bạn"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Đang bật/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Sẽ không bao giờ tự động tắt"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sẽ tự động tắt lúc bình minh"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Giao diện tối sử dụng màu đen tuyệt đối giúp tăng thời lượng pin. Lên lịch bật Giao diện tối sau khi màn hình tắt."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Giao diện tối dùng nền màu đen để giúp tăng thời lượng pin trên một số màn hình. Khi màn hình tắt đi, giao diện tối sẽ kích hoạt theo lịch."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Thời gian chờ khóa màn hình"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Đặt mã PIN để dùng vân tay"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Để bảo mật, hãy đặt hình mở khóa"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Nhập lại mật khẩu"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Nhập mật khẩu công việc của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Xác nhận hình của bạn"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Nhập hình mở khóa công việc của bạn"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Nhập lại mã PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Nhập mã PIN công việc của bạn"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Mật khẩu không khớp"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Mã PIN không khớp"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Vẽ lại hình mở khóa"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Trình đọc màn hình chủ yếu dành cho những người khiếm thị và thị lực kém"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Nhấn vào mục trên màn hình của bạn để nghe mục được đọc to"</string>
     <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_screen_magnification_title" msgid="7749786933314473224">"Phóng to"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Khu vực phóng to"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Hiển thị bộ điều khiển di chuyển"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Hiển thị cần điều khiển để di chuyển khu vực phóng to"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Cài đặt phóng to"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Phóng to bằng phím tắt và nhấn 3 lần"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Giới thiệu về tính năng Phóng to"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Tùy chọn"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Phóng to trên màn hình"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Nhấn 3 lần để thu phóng"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Nhấn vào nút để thu phóng"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Chọn thẻ SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Cam"</string>
     <string name="color_purple" msgid="6603701972079904843">"Tía"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Hồng"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Không có thẻ SIM nào được lắp"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Trạng thái SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Trạng thái SIM (khe cắm thẻ SIM %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">Đã bật 1</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Bật chế độ Không làm phiền"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Ngoại lệ"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Ngăn gián đoạn hình ảnh"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Cho phép tín hiệu hình ảnh"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Khi chế độ Không làm phiền đang bật"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Cho phép các hoạt động gây gián đoạn phát âm thanh"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Hạn chế thông báo"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Không phát âm thanh khi có thông báo"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Bạn sẽ thấy thông báo trên màn hình của mình"</string>
@@ -3333,10 +3341,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Tắt tiếng thiết bị nhưng cho phép ngoại lệ"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Ngoại lệ"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Lịch biểu"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Xem tất cả trường hợp ngoại lệ"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Các trường hợp ngoại lệ khi chế độ Không làm phiền đang bật"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Người"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Ứng dụng"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Chuông báo và các hoạt động gây gián đoạn khác"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Lịch biểu"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Thông báo đã tắt tiếng"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Khi chế độ Không làm phiền đang bật, âm thanh và rung sẽ bị tắt trừ các mục mà bạn cho phép ở trên."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Tắt tiếng tất cả ngoại trừ"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Đã tắt tiếng"</string>
@@ -3596,6 +3606,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Cuộc trò chuyện"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Cho phép tin nhắn"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Để đảm bảo các tin nhắn đã cho phép sẽ phát ra âm thanh, hãy kiểm tra xem thiết bị của bạn được đặt ở chế độ đổ chuông, rung hay im lặng."</string>
     <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>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Không có"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Không cho phép cuộc gọi"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Không cho phép tin nhắn"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Cho phép chuông báo thức"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Báo thức"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Từ đồng hồ hẹn giờ, chuông báo, hệ thống an ninh và các ứng dụng khác"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"báo thức"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Phát âm thanh nội dung nghe nhìn"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Âm thanh nội dung nghe nhìn"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Từ video, trò chơi và các nội dung nghe nhìn khác"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"nội dung phương tiện"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Cho phép âm chạm"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Âm chạm"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Từ bàn phím và các nút khác của bạn"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"âm chạm"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Cho phép lời nhắc"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Lời nhắc"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Từ các việc cần làm và lời nhắc"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"lời nhắc"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Cho phép sự kiện"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Sự kiện"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Từ các sự kiện lịch sắp tới"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Cho phép ứng dụng ghi đè"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Ngoại lệ ứng dụng"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Hiển thị trên các ứng dụng khác"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Cho phép hiển thị trên các ứng dụng khác"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Cho phép ứng dụng này hiển thị trên các ứng dụng khác mà bạn đang sử dụng. Điều này có thể ảnh hưởng đến việc bạn sử dụng các ứng dụng đó hoặc thay đổi cách chúng xuất hiện hoặc hoạt động."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Quyền truy cập vào mọi tệp"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Cho phép truy cập để quản lý tất cả các tệp"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Cho phép ứng dụng này đọc, sửa đổi và xóa tất cả các tệp trên thiết bị này hoặc bất kỳ thiết bị lưu trữ nào đã kết nối. Nếu bạn cho phép, ứng dụng có thể truy cập vào các tệp mà không cần thông báo rõ ràng cho bạn."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Có thể truy cập vào tất cả các tệp"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr thực tế ảo trình nghe âm thanh nổi trình trợ giúp dịch vụ"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Hiển thị trên các ứng dụng khác"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> ứng dụng được phép hiển thị trên các ứng dụng khác"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9a34277..2d926aa 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"隐私设置"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"已被管理员停用"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"不可用"</string>
     <string name="security_status_title" msgid="6958004275337618656">"安全状态"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"屏幕锁定、人脸解锁"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"屏幕锁定、指纹"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在应用中使用人脸解锁时,一律需要确认"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"删除人脸数据"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"设置人脸解锁"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"您可以使用人脸解锁功能来解锁设备、登录应用以及确认付款。\n\n注意:\n目视手机可能会让手机意外解锁。\n\n如果有人在您睁开双眼时将手机对准您的脸,手机会因此解锁。\n\n此外,长相与您相似的人(例如同胞兄弟姐妹)也能够解锁您的手机。"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"您可以使用人脸解锁功能来解锁设备、登录应用以及确认付款。\n\n注意:\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸,手机可能会因此解锁。\n\n长相与您十分相似的人(例如同胞兄弟姐妹)可能也能解锁您的手机。"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"您可以使用人脸解锁功能来解锁设备、登录应用以及确认付款。\n\n注意:\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸,也可能会解锁您的手机(即使您闭上眼睛)。\n\n此外,长相与您相似的人(例如与您具有相同特征的兄弟姐妹)可能也能解锁您的手机。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"要删除人脸数据吗?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系统会安全地将人脸解锁功能所用的脸部数据永久删除。移除数据后,您将需要使用 PIN 码、图案或密码来解锁手机、登录应用和确认付款。"</string>
@@ -766,8 +766,7 @@
     <string name="wifi_tap_to_sign_in" msgid="8658506618807549483">"点按此处即可登录网络"</string>
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
-    <!-- no translation found for link_speed (931786745741016446) -->
-    <skip />
+    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g>请求开启 WLAN"</string>
     <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g>请求关闭 WLAN"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"验证可调试应用的字节码"</string>
@@ -775,10 +774,8 @@
     <string name="show_refresh_rate" msgid="5742688821872354973">"显示刷新频率"</string>
     <string name="show_refresh_rate_summary" msgid="3558118122374609663">"显示当前的显示屏刷新频率"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
-    <!-- no translation found for nfc_quick_toggle_summary (3622326550467939809) -->
-    <skip />
-    <!-- no translation found for nfc_quick_toggle_summary (1460871052409162980) -->
-    <skip />
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"允许平板电脑在与 NFC 设备触碰时交换数据"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"允许手机在与 NFC 设备触碰时交换数据"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"开启 NFC"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC 可让此设备和附近的其他设备或目标(例如付款终端、门禁读卡器和互动式广告或标签)交换数据。"</string>
     <string name="nfc_secure_settings_title" msgid="8947380729696717356">"安全 NFC"</string>
@@ -880,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"身份"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"匿名身份"</string>
     <string name="wifi_password" msgid="1458802324849513755">"密码"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE 密码标识符"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"显示密码"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"选择 AP 频段"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"自动"</string>
@@ -921,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"正在与此设备分享 WLAN…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"正在连接…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"分享热点"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"验证您的身份"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"验证是您本人"</string>
     <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" 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>
@@ -1229,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"开启/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"一律不自动关闭"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"将在日出时自动关闭"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"深色主题使用纯黑背景,有助于延长您的电池续航时间。深色主题时间表会在您的屏幕进入关闭状态后开启。"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"在某些屏幕上,深色主题使用纯黑背景,有助于延长您的电池续航时间。深色主题时间表会在您的屏幕进入关闭状态后开启。"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"屏幕超时"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1717,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"要使用指纹,请设置 PIN 码"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"为了安全起见,请设置解锁图案"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"重新输入密码"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"请输入您的工作密码"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"确认您的图案"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"请绘制您的工作解锁图案"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"重新输入 PIN 码"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"请输入您的工作 PIN 码"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"密码不匹配"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN 码不匹配!"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"再次绘制图案"</string>
@@ -2054,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"屏幕阅读器主要适用于盲人和视力不佳的人士"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"点按屏幕上的内容即可让系统大声朗读出来"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好设置"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大功能"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大区域"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"显示移动控制器"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"显示用于移动放大区域的操纵杆型控制器"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"放大设置"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"通过“快捷手势”和“点按屏幕三次”进行放大"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"关于放大功能"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"选项"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"在屏幕上放大"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"点按三次即可放大屏幕"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"点按按钮即可放大"</string>
@@ -3087,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"选择 SIM 卡"</string>
     <string name="color_orange" msgid="216547825489739010">"橙色"</string>
     <string name="color_purple" msgid="6603701972079904843">"紫色"</string>
+    <string name="color_pink" msgid="8596872110888626708">"粉色"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"尚未插入SIM卡"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM 卡状态"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM 卡状态(SIM 卡插槽 %1$d)"</string>
@@ -3127,8 +3131,7 @@
     <string name="search_results_title" msgid="3360639917793022533">"设置"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"wifi, WLAN, 网络连接, 互联网, 无线, 数据, WLAN 网络"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"WLAN 通知, wlan 通知"</string>
-    <!-- no translation found for keywords_wifi_data_usage (4718555409695862085) -->
-    <skip />
+    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"流量消耗"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"停止振动, 点按, 键盘"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"使用 24 小时制"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"下载"</string>
@@ -3250,6 +3253,7 @@
       <item quantity="one">已启用 1 个</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"开启“勿扰”模式"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"例外情况"</string>
@@ -3276,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>:<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"屏蔽视觉打扰"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允许视觉信号"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"开启勿扰模式时"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"允许会发出声音的干扰项"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"限制通知"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"不发出通知提示音"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"您会在屏幕上看到通知"</string>
@@ -3337,10 +3341,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 个时间表可以自动开启</item>
       <item quantity="one">1 个时间表可以自动开启</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"将设备设为静音(例外情况除外)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"例外情况"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"设定时间"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"查看所有例外情况"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"“勿扰”模式处于开启状态时的例外情况"</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_schedule" msgid="2003707171924226212">"时间安排"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"已设为静音的通知"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"开启勿扰模式后,除了您在上方允许的项目外,所有音效和振动均会设为静音。"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"全部静音,除了"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"已设为静音"</string>
@@ -3600,6 +3606,7 @@
       <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
       <item quantity="one">另外 1 人</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"对话"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"允许显示消息"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"为确保设备在显示所允许的消息时发出提示音,请检查您的设备目前是设为响铃、振动还是静音。"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系统会在“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”排程进行时屏蔽收到的消息。您可以调整相应设置,以便允许您的好友、家人或其他联系人与您联系。"</string>
@@ -3613,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"无"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"不允许任何通话"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"不允许使用任何消息功能"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"允许闹钟"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"闹钟"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"来自定时器、闹钟、安防系统和其他应用"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"闹钟"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"播放媒体提示音"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"媒体声音"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"来自视频、游戏和其他媒体内容"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"媒体"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"允许轻触提示音"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"触摸提示音"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"来自键盘和其他按钮"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"轻触提示音"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"允许提醒"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"提醒"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"来自任务和提醒"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"提醒"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"允许活动"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"活动"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"来自即将进行的日历活动"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允许应用覆盖"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"应用例外情况"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3917,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"显示在其他应用的上层"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"允许显示在其他应用的上层"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"允许此应用显示在您当前使用的其他应用的上层。这可能会干扰您使用相关应用,或变更这类应用的显示或运行方式。"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"所有文件访问权限"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"授予所有文件的管理权限"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"允许此应用读取、修改和删除此设备或任何已连接存储卷上的所有文件。如果您授予该权限,应用无需明确通知您即可访问文件。"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"可以访问所有文件"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr 虚拟实境 监听器 立体 助手服务"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"显示在其他应用的上层"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> 个(共 <xliff:g id="COUNT_1">%2$d</xliff:g> 个)应用可以显示在其他应用的上层"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b4f83e5..9051aea 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"私隱權"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"已由管理員停用"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"不適用"</string>
     <string name="security_status_title" msgid="6958004275337618656">"安全性狀態"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 臉孔解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在應用程式內使用「臉孔解鎖」時,每次都要確認"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"刪除臉容資料"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"設定「臉孔解鎖」"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"使用「臉孔解鎖」即可解鎖裝置、登入應用程式及確認付款。\n\n注意事項:\n即使您不想解鎖手機,但查看手機仍會解鎖。\n\n在您睜開雙眼時,如果其他人將手機舉到您面前,將可解鎖您的手機。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"使用「面孔解鎖」即可解鎖裝置、登入應用程式及確認付款。\n\n注意事項:\n即使您不想解鎖手機,但查看手機仍會解鎖。\n\n如果其他人將手機舉到您面前,將可解鎖您的手機。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"使用「臉孔解鎖」即可解鎖裝置、登入應用程式及確認付款。\n\n注意事項:\n即使您不想解鎖,看著手機亦會解鎖。\n\n如果其他人將手機舉到您面前,即使您閉上雙眼,手機亦會解鎖。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"是否刪除臉容資料?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系統會妥善地將「臉孔解鎖」功能使用的臉孔資料永久刪除。資料移除後,您便需要使用 PIN、圖案或密碼來解鎖手機、登入應用程式及確認付款。"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"身分"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"匿名身分"</string>
     <string name="wifi_password" msgid="1458802324849513755">"密碼"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE 密碼識別碼"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"顯示密碼"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"選擇存取點頻段"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"自動"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"正在與此裝置分享 Wi-Fi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"連接中…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"分享熱點"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"驗證這是您本人"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"驗證您的身分"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"永遠不會自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"日出時會自動關閉"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"「深色主題背景」使用純黑色背景以延長電池壽命。此功能預定在螢幕關閉後開啟。"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"「深色主題背景」使用黑色背景以延長部分螢幕的電池壽命。「深色主題背景」時間表會等待啟動,直至螢幕關閉。"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"螢幕逾時"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1715,8 +1716,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"如要使用指紋,請設定 PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"為安全起見,請設定圖案"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"請重新輸入密碼"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"輸入工作設定檔密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"確認圖形"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"畫出工作設定檔上鎖圖案"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"請重新輸入 PIN"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"輸入工作設定檔 PIN 碼"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"密碼不符"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN 不符"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"再次畫出圖案"</string>
@@ -2052,20 +2056,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"主要為失明和弱視人士而設的螢幕閱讀器"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"輕按畫面上的項目即可收聽系統朗讀項目"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大範圍"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"顯示移動控制器"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"顯示類似搖桿的控制器,以移動放大範圍"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"放大設定"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"使用快速鍵和輕按三下來放大"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"關於放大功能"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"選項"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"放大螢幕"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"輕按 3 次即可縮放畫面"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"輕按按鈕即可縮放"</string>
@@ -3085,6 +3091,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"選取 SIM 卡"</string>
     <string name="color_orange" msgid="216547825489739010">"橙色"</string>
     <string name="color_purple" msgid="6603701972079904843">"紫色"</string>
+    <string name="color_pink" msgid="8596872110888626708">"粉紅色"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"尚未插入 SIM 卡"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM 卡狀態"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM 卡狀態 (SIM 卡插槽 %1$d)"</string>
@@ -3247,6 +3254,7 @@
       <item quantity="one">已啟用 1 個日程表</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"開啟「請勿騷擾」模式"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"例外情況"</string>
@@ -3273,7 +3281,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>:<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"封鎖視覺干擾"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允許視覺訊號"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"開啟「請勿騷擾」模式時"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"允許發出音效的干擾"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"限制通知"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"無音效通知"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"您會在螢幕上看到通知"</string>
@@ -3334,10 +3342,12 @@
       <item quantity="other">系統已自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 個日程表</item>
       <item quantity="one">系統已自動啟用 1 個日程表</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"將裝置設為靜音但允許例外情況"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"例外情況"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"設定時間"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"查看所有例外情況"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"開啟「請勿騷擾」模式時的例外情況"</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_schedule" msgid="2003707171924226212">"時間表"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"設為靜音的通知"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"開啟「請勿騷擾」模式時,除了您在上方允許的項目外,所有音效和震動會設為靜音。"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"全部設為靜音,除了"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"已設為靜音"</string>
@@ -3597,6 +3607,7 @@
       <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
       <item quantity="one">另外 1 人</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"對話"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"允許訊息"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"如要確保允許的訊息發出音效,請檢查您的裝置目前設為發出鈴聲、震動還是靜音。"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」中,收到的訊息會被封鎖。您可以調整設定,讓好友、家人或其他聯絡人聯絡您。"</string>
@@ -3610,15 +3621,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"無"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"不允許任何通話"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"不允許任何訊息"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"允許鬧鐘"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"鬧鐘"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"來自計時器、鬧鐘、保安系統和其他應用程式"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"鬧鐘"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"播放媒體音效"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"媒體音效"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"來自影片、遊戲和其他媒體"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"媒體"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"允許觸控音效"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"觸控音效"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"來自鍵盤和其他按鈕"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"觸控音效"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"允許提醒"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"提醒"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"來自工作和提醒"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"提醒"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"允許活動通知"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"活動"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"來自即將開始的日曆活動"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式取代「請勿騷擾」"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"應用程式例外情況"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3914,6 +3930,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"在其他應用程式上面顯示"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"可顯示在其他應用程式上面"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"允許此應用程式在您目前使用的其他應用程式上層顯示內容,因此可能會干擾您使用相關應用程式,或變更這些應用程式的顯示或運作方式。"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"所有檔案存取權"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"允許存取以管理所有檔案"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"允許此應用程式讀取、修改和刪除此裝置或任何已連接的儲存空間卷宗上的所有檔案。如獲得權限,應用程式可能會在您不知情的情況下存取檔案。"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"可存取所有檔案"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"VR 虛擬實境 接聽器 立體聲 協助服務"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"在其他應用程式上面顯示"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個) 可顯示在其他應用程式上面"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f673a85..55933ab 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"隱私"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"已由管理員停用"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"無法使用"</string>
     <string name="security_status_title" msgid="6958004275337618656">"安全性狀態"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 人臉解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在應用程式中使用人臉解鎖時,一律必須經過確認"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"刪除臉孔資料"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"設定人臉解鎖功能"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式及確認付款。\n\n注意事項:\n查看手機可能會導致手機意外解鎖。\n\n如果有人在你睜開雙眼時將手機置於你面前,手機可能會因此解鎖。\n\n長相與你相似的人可能可以解鎖你的手機,例如長相雷同的兄弟姊妹。"</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式,以及確認付款。\n\n注意事項:\n只要看著手機,就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉,手機可能就會解鎖。\n\n長相與你十分相似的人 (例如你的孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式及確認付款。\n\n注意事項:\n只要看著手機,就可能造成意外解鎖。\n\n如果有人將手機對著你的臉 (無論你是否有睜開雙眼),手機可能會因此解鎖。\n\n長相與你相似的人(例如你的孿生兄弟姐妹)可能可以解鎖你的手機。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"要刪除臉孔資料嗎?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系統會安全地將人臉解鎖功能使用的臉部資料永久刪除。資料移除後,當你解鎖手機、登入應用程式及確認付款時,都必須使用 PIN 碼、解鎖圖案或密碼。"</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"身分"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"匿名身分"</string>
     <string name="wifi_password" msgid="1458802324849513755">"密碼"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"SAE 密碼 ID"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"顯示密碼"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"選取存取點頻帶"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"自動"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"正在與這個裝置分享 Wi‑Fi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"連線中…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"分享無線基地台"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"驗證你的身分"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"確認你的身分"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"一律不自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"將於日出時自動關閉"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"深色主題使用純黑色彩,有助於延長電池續航力。這項功能會保持開啟狀態,直到螢幕關閉為止。"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"深色主題可針對某些畫面套用黑色背景,藉此延長電池續航力。這項功能會保持開啟狀態,直到螢幕關閉為止。"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"螢幕自動關閉"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1714,8 +1715,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"如要使用指紋,請設定 PIN 碼"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"為了安全起見,請設定解鎖圖案"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"請重新輸入你的密碼"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"請輸入工作資料夾的密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"確認圖案"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"請畫出工作資料夾的解鎖圖案"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"請重新輸入你的 PIN 碼"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"請輸入工作資料夾的 PIN 碼"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"密碼不符"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN 碼不符"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"再次畫出剛剛的圖案"</string>
@@ -2051,20 +2055,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"這是一種螢幕閱讀器,主要適用於視障和低視能人士"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"輕觸畫面上的項目即可聽取項目內容"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大區域"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"顯示移動控制器"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"顯示類似搖桿的控制器,方便你用來移動放大區域"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"放大設定"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"使用快速手勢並輕觸三下即可放大畫面"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"關於放大功能"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"選項"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"放大畫面內容"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"輕觸三下即可縮放畫面"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"輕觸按鈕即可縮放"</string>
@@ -3084,6 +3090,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"選取 SIM 卡"</string>
     <string name="color_orange" msgid="216547825489739010">"橘色"</string>
     <string name="color_purple" msgid="6603701972079904843">"紫色"</string>
+    <string name="color_pink" msgid="8596872110888626708">"粉紅色"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"尚未插入 SIM 卡"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM 卡狀態"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM 卡狀態 (SIM 卡插槽 %1$d)"</string>
@@ -3246,6 +3253,7 @@
       <item quantity="one">已啟用 1 項排程</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"開啟「零打擾」模式"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"例外狀況"</string>
@@ -3272,7 +3280,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>:<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"封鎖視覺干擾"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允許視覺信號"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"開啟「零打擾」模式時"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"允許發出音效的干擾"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"限制通知"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"不發出通知音效"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"你將會在畫面上看到通知"</string>
@@ -3333,10 +3341,12 @@
       <item quantity="other">系統可以自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 項排程</item>
       <item quantity="one">系統可以自動啟用 1 項排程</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="4456460102057665854">"將裝置設為靜音 (例外狀況除外)"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"例外狀況"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"設定時間"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"查看所有例外狀況"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"開啟「零打擾」模式時的例外狀況"</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_schedule" msgid="2003707171924226212">"排程"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"設為靜音的通知"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"開啟「零打擾」模式時,系統會將音效和震動設為靜音 (你在上方允許的項目除外)。"</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"全部設為靜音,除了"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"已設為靜音"</string>
@@ -3596,6 +3606,7 @@
       <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
       <item quantity="one">另外 1 人</item>
     </plurals>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"對話"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"允許顯示訊息"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"如要確認允許的訊息是否會發出音效,請檢查你的裝置目前設為響鈴、震動還是靜音。"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系統會在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」排程進行時封鎖訊息。你可以調整設定,讓好友、家人或其他聯絡人可以聯絡你。"</string>
@@ -3609,15 +3620,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"無"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"不允許任何通話"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"不允許任何訊息"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"允許播放鬧鐘音效"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"鬧鐘"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"計時器、鬧鐘、安全系統和其他應用程式的通知"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"鬧鐘"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"播放媒體音效"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"媒體音效"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"影片、遊戲和其他媒體的音效"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"媒體"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"允許播放觸控音效"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"觸控音效"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"鍵盤和其他按鈕的觸控音效"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"觸控音效"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"允許顯示提醒/播放提醒音效"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"提醒"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"工作和提醒的通知/音效"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"提醒"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"允許顯示活動通知/播放活動通知音效"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"活動"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"近期日曆活動的通知/音效"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式覆寫"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"例外應用程式"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3913,6 +3929,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"顯示在其他應用程式上層"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"允許顯示在其他應用程式上層"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"允許此應用程式顯示在畫面上層 (覆蓋你使用的其他應用程式)。這可能會干擾你使用相關的應用程式,或是影響它們的顯示或運作方式。"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"所有檔案的存取權"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"授予管理所有檔案的權限"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"允許這個應用程式讀取、修改及刪除這部裝置或任何已連結儲存空間上的所有檔案。如果應用程式獲得授權,可能會在你不知情的情況下存取檔案。"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"可以存取所有檔案"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr 虛擬實境 接聽器 音響 小幫手 服務"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"顯示在其他應用程式上層"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式可以顯示在其他應用程式上層 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個應用程式)"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c4f5994..e49b38e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -313,7 +313,7 @@
     <string name="security_settings_summary" msgid="1627059516127354233">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Ubumfihlo"</string>
-    <string name="disabled_by_administrator_summary" msgid="4181894719300350343">"Kukhutshazwe umlawuli"</string>
+    <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ayitholakali"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Isimo sokuphepha"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ukukhiya isikrini, i-face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ukukhiywa kwesikrini, izigxivizo zeminwe"</string>
@@ -371,7 +371,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uma usebenzisa i-face unlock kuzinhlelo zokusebenza, hlala udinga isinyathelo sokuqinisekisa"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Susa idatha yobuso"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Setha i-face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="4263048343191609059">"Sebenzisa i-face unlock ukuze uvule idivayisi yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo.\n\nKhumbula:\nUkubheka ifoni kungayivula uma ungahlosile ukwenza njalo.\n\nIfoni yakho ingavulwa omunye umuntu uma iphethwe ngasebusweni bakho ngenkathi amehlo akho avuliwe.\n\nIfoni yakho ingavulwa omunye umuntu ofana kakhulu nawe, asithi isihlobo esifana nawe."</string>
+    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Sebenzisa i-face unlock ukuze uvule idivayisi yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo.\n\nKhumbula:\nUkubheka ifoni kungayivula uma ungahlosile ukwenza njalo.\n\nIfoni yakho ingavulwa omunye umuntu uma iphethwe ngasebusweni bakho.\n\nIfoni yakho ingavulwa omunye umuntu ofana kakhulu nawe, asithi isihlobo esifana nawe."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Sebenzisa i-face unlock ukuze uvule idivayisi yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo.\n\nKhumbula:\nUkubheka ifoni kungayivula uma ungahlosile ukwenza njalo.\n\nIfoni yakho ingavulwa omunye umuntu uma iphakanyiselwe ebusweni bakho, nanoma amehlo akho avaliwe.\n\nIfoni yakho ingavulwa umuntu obukeka kakhulu njengawe, asithi, isihlobo esifanayo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Susa idatha yobuso?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Idatha yobuso esetshenziswe i-face unlock izosuswa unaphakade futhi ngokuphephile. Ngemuva kokususwa, uzodinga iphinikhodi, iphethini, noma iphasiwedi ukuze uvule ifoni yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo."</string>
@@ -877,7 +877,6 @@
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Ukuhlonza"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Ukuhlonza okungaziwe"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Iphasiwedi"</string>
-    <string name="wifi_sae_password_id" msgid="129826381089135796">"Isihlonzi sephasiwedi ye-SAE"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Bonisa iphasiwedi"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Khetha ibhendi le-AP"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Okuzenzakalelayo"</string>
@@ -918,9 +917,11 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Yabelana nge-Wi‑Fi ngale divayisi…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Iyaxhuma…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Yabelana i-hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="5246641326066972419">"Qinisekisa ukuthi unguwe"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Qinisekisa ukuthi nguwe"</string>
     <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" 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>
@@ -1226,7 +1227,7 @@
     <string name="dark_ui_summary_on" msgid="3886998135388176000">"Vuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ngeke ize ivaleke ngokuzenzakalela"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga"</string>
-    <string name="dark_ui_text" msgid="3691323174656626778">"Itimu emnyama isebenzisa ubumnyama beqiniso ukuze igcine ibhethri lakho liphila isikhathi eside. Itimu emnyama ihlelelwe ukulinga ukuvula isikrini sakho size sivale."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Itimu emnyama isebenzisa ingemuva elimnyama ukuze isize ukugcina ibhethri liphila isikhathi eside kwezinye izikrini. Itimu emnyama ihlelelwe ukulinga ukuvula isikrini sakho size sivale."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Isikrini siphelelwe yisikhathi"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1715,8 +1716,11 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Ukuze usebenzise izigxivizo zeminwe, setha iphinikhodi"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Ukuze uvikelwe, setha iphethini"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Faka kabusha iphasiwedi yakho"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Faka iphasiwedi yakho yomsebenzi"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Qinisekisa iphathini yakho"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Faka iphethini yakho yomsebenzi"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Faka kabusha i-PIN yakho"</string>
+    <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Faka iphinikhodi yakho yomsebenzi"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Amaphasiwedi awafani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"Ama-PIN awafani"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Dweba iphethini yakho futhi"</string>
@@ -2052,20 +2056,22 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Isifundi sesikrini kakhulukazi esabantu abangaboni nabanokubona okuncane"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Thepha izinto esikrinini sakho ukuze uzizwe zifundelwa phezulu"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Okuncanyelwayo kwamagama-ngcazo"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukukhuliswa"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7749786933314473224">"I-Magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Indawo yokukhulisa"</string>
+    <!-- no translation found for accessibility_magnification_enable_mode_title (4390488034396824276) -->
+    <skip />
     <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_window_control_switch_title" msgid="4926933143910288191">"Bonisa isilawuli esiningi"</string>
-    <string name="accessibility_magnification_window_control_switch_summary" msgid="7628270839775330328">"Bonisa isilawuli esifana ne-joystick ukuhambisa indawo yokukhulisa"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="7357466386783992094">"Izilungiselelo zokukhulisa"</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>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Khulisa ngenkinobho futhi uthephe kathathu"</string>
+    <string name="accessibility_screen_magnification_about" msgid="7084391040140715321">"Mayelana ne-Magnify"</string>
+    <string name="accessibility_screen_option" msgid="8465307075278878145">"Izinketho"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Sondeza isithombe kusikrini"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Thepha izikhathi ezingu-3 ukuze usondeze"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Thepha inkinobho ukuze usondeze"</string>
@@ -3085,6 +3091,7 @@
     <string name="sim_card_select_title" msgid="8146523005929848793">"Khetha ikhadi le-SIM"</string>
     <string name="color_orange" msgid="216547825489739010">"Okuwolintshi"</string>
     <string name="color_purple" msgid="6603701972079904843">"Phephuli"</string>
+    <string name="color_pink" msgid="8596872110888626708">"Okuphinki"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"Awekho amakhadi we-SIM afakiwe"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"Isimo se-SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"Isimo se-SIM (imbobo ye-sim %1$d)"</string>
@@ -3247,6 +3254,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> kunikwe amandla</item>
     </plurals>
     <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>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Vula ukungaphazamisi"</string>
     <string name="zen_mode_behavior_settings_title" msgid="2511039563690605227">"Okuhlukile"</string>
@@ -3273,7 +3281,7 @@
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vimbela ukuphazamiseka okubonakalayo"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vumela amasignali okubuka"</string>
-    <string name="zen_mode_settings_category" msgid="3531156898689133018">"Lapho kuvulwe khona Ukungaphazamisi"</string>
+    <string name="zen_mode_settings_category" msgid="3794956668816783447">"Vumela iziphazamiso ezenza umsindo"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="5881948256821375291">"Khawulela izaziso"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Awukho umsindo kusukela kuzaziso"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Uzobona izaziso kusikrini sakho"</string>
@@ -3334,10 +3342,12 @@
       <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_category_behavior" msgid="4456460102057665854">"Thulisa idivayisi kodwa vumela okukhishiwe"</string>
-    <string name="zen_category_exceptions" msgid="6329803391764042865">"Okuhlukile"</string>
-    <string name="zen_category_schedule" msgid="6117378495178187519">"Ishejuli"</string>
-    <string name="zen_sound_title" msgid="7345256674791165630">"Bona okuhlukile"</string>
+    <string name="zen_category_behavior" msgid="9188445582469977640">"Okuhlukile uma Ukungaphazamisi kuvuliwe"</string>
+    <string name="zen_category_people" msgid="8252926021894933047">"Abantu"</string>
+    <string name="zen_category_apps" msgid="1167374545618451925">"Izinhlelo zokusebenza"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Ama-alamu nokunye ukuphazamiseka"</string>
+    <string name="zen_category_schedule" msgid="2003707171924226212">"Amashejuli"</string>
+    <string name="zen_category_visuals" msgid="2875037337125038831">"Izaziso ezithulisiwe"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Uma kuvulwe ukungaphazamisi, umsindo nokudlidliza kuzothuliswa, ngaphandle kwezinto ozivumela ngaphezulu."</string>
     <string name="zen_sound_category_title" msgid="3092475944624375238">"Thulisa konke ngaphandle"</string>
     <string name="zen_sound_all_muted" msgid="1134675098348493443">"Kuthulisiwe"</string>
@@ -3597,6 +3607,7 @@
       <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_conversations_title" msgid="5491912973456026379">"Izingxoxo"</string>
     <string name="zen_mode_messages" msgid="7835537207069585861">"Vumela imilayezo"</string>
     <string name="zen_mode_messages_footer" msgid="6996375319078720643">"Ukuze uqinisekise ukuthi imilayezo evunyelwe nayo yenza umsindo, hlola uma ngabe idivayisi yakho isethelwe ukuthi ikhale, idlidlize, noma ithule."</string>
     <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>
@@ -3610,15 +3621,20 @@
     <string name="zen_mode_from_none" msgid="8456745188276131873">"Lutho"</string>
     <string name="zen_mode_from_none_calls" msgid="419514492513274710">"Ungavumeli amakholi"</string>
     <string name="zen_mode_from_none_messages" msgid="122458013195428548">"Ungavumeli imilayezo"</string>
-    <string name="zen_mode_alarms" msgid="1111047002365378012">"Vumela ama-alamu"</string>
+    <string name="zen_mode_alarms" msgid="5989343060100771099">"Ama-alamu"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"Kusukela kuzibali sikhathi, ama-alamu, amasistimu okuvikela, nezinye izinhlelo zokusebenza"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"ama-alamu"</string>
-    <string name="zen_mode_media" msgid="3470940840136036522">"Dlala imisindo yemidiya"</string>
+    <string name="zen_mode_media" msgid="885017672250984735">"Imisindo yemidiya"</string>
+    <string name="zen_mode_media_summary" msgid="3052407079117545815">"Kusukela kumavidiyo, amageyimu, nenye imidiya"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"imidiya"</string>
-    <string name="zen_mode_system" msgid="4996563074066075171">"Vumela imisindo yokuthinta"</string>
+    <string name="zen_mode_system" msgid="7301665021634204942">"Imisindo yokuthinta"</string>
+    <string name="zen_mode_system_summary" msgid="7905531918458452765">"Kusukela kukhibhodi yakho nezinye izinkinobho"</string>
     <string name="zen_mode_system_list" msgid="2256218792042306434">"imisindo yokuthinta"</string>
-    <string name="zen_mode_reminders" msgid="1957379696610030851">"Vumela izikhumbuzi"</string>
+    <string name="zen_mode_reminders" msgid="1970224691551417906">"Izikhumbuzi"</string>
+    <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"Kusukela kumisebenzi nezikhumbuzi"</string>
     <string name="zen_mode_reminders_list" msgid="3133513621980999858">"izikhumbuzi"</string>
-    <string name="zen_mode_events" msgid="5695716091022098055">"Vumela imicimbi"</string>
+    <string name="zen_mode_events" msgid="7455308377739125312">"Imibuthano"</string>
+    <string name="zen_mode_events_summary" msgid="3241903481309766428">"Kusukela kumicimbi yekhalenda ezayo"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Vumela izinhlelo zokusebenza ukubhala ngaphezulu"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="4142154650779609193">"Ukukhishwa kohlelo lokusebenza"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="3992144201138339160">
@@ -3914,6 +3930,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Bonisa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Vumela ukuboniswa ngaphezu kwezinye izinhlelo zokusebenza"</string>
     <string name="allow_overlay_description" msgid="2266886438777971131">"Vumela lolu hlelo lokusebenza ukuthi luboniswe ngaphezulu kwezinye izinhlelo zokusebenza ozisebenzisayo. Lingaphazamisana nokusebenza kwalezo zinhlelo zokusebenza noma lishintshe indlela ezibonakala zivela ngayo noma eziziphatha ngayo."</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"Ukufinyelela kuwo wonke amafayela"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"Vumela ukufinyelela ukuze kuphathwe wonke amafayela"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Vumela lolu hlelo lokusebenza ukuthi lufunde, lulungise luphinde lususe wonke amafayela kule divayisi noma kwamanye amavolumu axhunyiwe esitoreji. Uma linikeziwe, uhlelo lokusebenza lungafinyelela kumafayela ngaphandle kokwazi kwakho okusobala."</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"Ingafinyelela kuwo wonke amafayela"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"isevisi yomsizi we-vr wangempela okubonakalayo kwesitiriyo somlaleli"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Bonisa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%2$d</xliff:g> zivunyelwe ukuboniswa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index e302905..4440358 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -702,6 +702,24 @@
         <item>Accessibility volume</item>
     </string-array>
 
+    <!-- Keys for the list of accessibility auto click xml. -->
+    <string-array name="accessibility_autoclick_control_selector_keys" translatable="false">
+        <item>accessibility_control_autoclick_default</item>
+        <item>accessibility_control_autoclick_200ms</item>
+        <item>accessibility_control_autoclick_600ms</item>
+        <item>accessibility_control_autoclick_1sec</item>
+        <item>accessibility_control_autoclick_custom</item>
+    </string-array>
+
+    <!-- Values for the list of accessibility auto click, pairs to Keys . -->
+    <integer-array name="accessibility_autoclick_selector_values" translatable="false">
+        <item>0</item>
+        <item>200</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </integer-array>
+
     <!-- Keys for the list of accessibility timeouts xml. -->
     <string-array name="accessibility_timeout_control_selector_keys" translatable="false">
         <item>accessibility_control_timeout_default</item>
@@ -1492,4 +1510,17 @@
         <item>@color/palette_list_color_purple</item>
         <item>@color/palette_list_color_pink</item>
     </array>
-</resources>
\ No newline at end of file
+
+    <!--String arrays for showing the rtt settings options -->
+    <string-array name="rtt_setting_mode">
+        <!-- 0: Invalid value -->
+        <item></item>
+        <!-- 1:  Not visible -->
+        <item>@string/rtt_settings_no_visible</item>
+        <!-- 2:  Visible during call -->
+        <item>@string/rtt_settings_visible_during_call</item>
+        <!-- 3:  Always visible -->
+        <item>@string/rtt_settings_always_visible</item>
+    </string-array>
+
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index a4d0e47..fc2ca1f 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -431,4 +431,7 @@
 
     <!-- RTT setting intent action -->
     <string name="config_rtt_setting_intent_action" translatable="false"></string>
+
+    <!-- Package name of dialer supports RTT setting-->
+    <string name="config_rtt_setting_package_name" translatable="false"></string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e68feb8..330ada4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -812,7 +812,7 @@
     <!-- Button text in face settings which lets the user enroll their face [CHAR LIMIT=40] -->
     <string name="security_settings_face_settings_enroll">Set up face unlock</string>
     <!-- Text shown in face settings explaining what your face can be used for. [CHAR LIMIT=NONE] -->
-    <string name="security_settings_face_settings_footer">Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
+    <string name="security_settings_face_settings_footer">Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
     <!-- Text shown in face settings explaining what your face can be used for. Used when attention checking is not supported. [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_settings_footer_attention_not_supported">Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
     <!-- Dialog title shown when the user removes an enrollment [CHAR LIMIT=35] -->
@@ -2003,8 +2003,6 @@
     <string name="wifi_eap_anonymous">Anonymous identity</string>
     <!-- Label for the password of the secured network -->
     <string name="wifi_password">Password</string>
-    <!-- Label for the sae password id of the secured network [CHAR LIMIT=32] -->
-    <string name="wifi_sae_password_id">SAE password identifier</string>
     <!-- Label for the check box to show password -->
     <string name="wifi_show_password">Show password</string>
     <!-- Label for the RadioGroup to choose wifi ap band -->
@@ -2091,7 +2089,8 @@
     <string name="wifi_dpp_wifi_password">Wi\u2011Fi password: <xliff:g id="password" example="my password">%1$s</xliff:g></string>
     <!-- Hint for Wi-Fi hotspot password [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_hotspot_password">Hotspot password: <xliff:g id="password" example="my password">%1$s</xliff:g></string>
-    <!-- Label for specifying if a Wi-Fi network supports auto connection [CHAR LIMIT=50]  -->
+    <!-- Label for a Wi-Fi network to specify if the device will auto connect to the Wi-Fi network
+         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">Allow connection to this network when in range</string>
@@ -2824,7 +2823,7 @@
     <!-- Display settings screen, summary of Dark UI when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_summary_on_auto_mode_auto">Will turn off automatically at sunrise</string>
     <!-- Dark theme screen, description of Dark theme feature. [CHAR LIMIT=NONE] -->
-    <string name="dark_ui_text">Dark theme uses true black to help keep your battery alive longer. Dark theme schedules wait to turn on until your screen is off.</string>
+    <string name="dark_ui_text">Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.</string>
 
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
     <string name="screen_timeout">Screen timeout</string>
@@ -4774,6 +4773,8 @@
     <string name="accessibility_screen_magnification_title">Magnify</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] -->
@@ -4786,10 +4787,6 @@
     <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 preference screen to show move controller. [CHAR LIMIT=35] -->
-    <string name="accessibility_magnification_window_control_switch_title">Show move controller</string>
-    <!-- Summary for the accessibility preference screen to show move controller. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_window_control_switch_summary">Show a joystick-like controller to move the magnification area</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] -->
@@ -4921,11 +4918,25 @@
     <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
     <string name="accessibility_display_inversion_preference_subtitle">Turn light screens dark so people who are sensitive to bright light can have a better viewing experience.\n\nNote: dark colors will turn light. Images will also be inverted.</string>
     <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_autoclick_preference_title">Dwell timing</string>
+    <string name="accessibility_autoclick_preference_title">Auto click (dwell timing)</string>
     <!-- Footer text to explain what autoclick does -->
     <string name="accessibility_autoclick_description">If you are using a mouse, you can set the cursor to take action automatically when it stops moving for a certain amount of time.</string>
-    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
-    <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>
+    <!-- Option heading to leave the auto click requirement for accessibility users at its default level. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_default_title">None</string>
+    <!-- Option heading to leave the auto click requirement for accessibility users at its short level. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_short_title">Short</string>
+    <!-- Option summary text for the auto click delay 0.2 seconds radio button. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_short_summary">0.2 seconds</string>
+    <!-- Option heading to leave the auto click requirement for accessibility users at its medium level. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_medium_title">Medium</string>
+    <!-- Option summary text for the auto click delay 0.6 seconds radio button. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_medium_summary">0.6 seconds</string>
+    <!-- Option heading to leave the auto click requirement for accessibility users at its long level. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_long_title">Long</string>
+    <!-- Option summary text for the auto click delay 1 second radio button. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_long_summary">1 second</string>
+    <!-- Option heading to leave the auto click requirement for accessibility users at its custom level. [CHAR LIMIT=35] -->
+    <string name="accessibility_autoclick_custom_title">Custom</string>
     <!-- Title for accessibility preference screen for configuring vibrations. -->
     <string name="accessibility_vibration_settings_title">Vibration &amp; haptic strength</string>
     <!-- Title for accessibility preference for configuring notification vibrations. -->
@@ -7607,6 +7618,9 @@
     <!-- 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>
 
+    <!-- Sound: Summary for the Do not Disturb option and associated settings page. [CHAR LIMIT=240]-->
+    <string name="zen_mode_settings_summary">Only get notified by important people and apps</string>
+
     <!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->
     <string name="zen_mode_slice_subtitle">Limit interruptions</string>
 
@@ -7686,7 +7700,7 @@
     <string name="zen_mode_visual_signals_settings_subtitle">Allow visual signals</string>
 
     <!-- Do not disturb: zen settings screens category title [CHAR LIMIT=100] -->
-    <string name="zen_mode_settings_category">When Do Not Disturb is on</string>
+    <string name="zen_mode_settings_category">Allow interruptions that make sound</string>
 
     <!-- Do not disturb: restrict notifications title [CHAR LIMIT=80] -->
     <string name="zen_mode_restrict_notifications_title">Restrict notifications</string>
@@ -7827,15 +7841,19 @@
         <item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> schedules can turn on automatically</item>
     </plurals>
 
-    <!-- Do not disturb settings, category header [CHAR LIMIT=120]-->
-    <string name="zen_category_behavior">Mute device but allow exceptions</string>
-    <!-- Do not disturb settings, exceptions to dnd title [CHAR LIMIT=100]-->
-    <string name="zen_category_exceptions">Exceptions</string>
-    <!-- Do not disturb settings, category header [CHAR LIMIT=100]-->
-    <string name="zen_category_schedule">Schedule</string>
+    <!-- Do not disturb settings, main screen, category header [CHAR LIMIT=120]-->
+    <string name="zen_category_behavior">Exceptions when Do Not Disturb is on</string>
+    <!-- Do not disturb settings, main screen, field, dnd breakthrough [CHAR LIMIT=100]-->
+    <string name="zen_category_people">People</string>
+    <!-- Do not disturb settings, main screen, field, dnd breakthrough  [CHAR LIMIT=100]-->
+    <string name="zen_category_apps">Apps</string>
+    <!-- Do not disturb settings, main screen, field, dnd breakthrough  [CHAR LIMIT=100]-->
+    <string name="zen_category_exceptions">Alarms &amp; other interruptions</string>
+    <!-- Do not disturb settings, main screen, field, schedules [CHAR LIMIT=100]-->
+    <string name="zen_category_schedule">Schedules</string>
+    <!-- Do not disturb settings, main screen, field, dnd visuals [CHAR LIMIT=100]-->
+    <string name="zen_category_visuals">Silenced notifications</string>
 
-    <!-- Do not disturb settings, sound and vibrations exceptions title [CHAR LIMIT=100]-->
-    <string name="zen_sound_title">See all exceptions</string>
     <!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->
     <string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>
     <!-- Do not disturb settings, sound and vibrations screen category [CHAR LIMIT=100]-->
@@ -8598,6 +8616,8 @@
         <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>
     </plurals>
 
+    <string name="zen_mode_conversations_title">Conversations</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Allow messages</string>
 
@@ -8638,31 +8658,46 @@
     <string name="zen_mode_from_none_messages">Don\u2019t allow any messages</string>
 
     <!-- [CHAR LIMIT=80] Zen mode settings: Allow alarms option -->
-    <string name="zen_mode_alarms">Allow alarms</string>
+    <string name="zen_mode_alarms">Alarms</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow alarms summary -->
+    <string name="zen_mode_alarms_summary">From timers, alarms, security systems, and other apps</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option (ie: sound from alarm clock) -->
     <string name="zen_mode_alarms_list">alarms</string>
 
     <!-- [CHAR LIMIT=80] Zen mode settings: Allow media (sound from video) to bypass dnd -->
-    <string name="zen_mode_media">Play media sounds</string>
+    <string name="zen_mode_media">Media sounds</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow media (sound from video) to bypass dnd  summary-->
+    <string name="zen_mode_media_summary">From videos, games, and other media</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Media (ie: sound from video) -->
     <string name="zen_mode_media_list">media</string>
 
     <!-- [CHAR LIMIT=80] Zen mode settings: allow touch sounds to bypass DND  -->
-    <string name="zen_mode_system">Allow touch sounds</string>
+    <string name="zen_mode_system">Touch sounds</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: allow touch sounds to bypass DND summary  -->
+    <string name="zen_mode_system_summary">From your keyboard and other buttons</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: System sounds (ie: touch sounds) -->
     <string name="zen_mode_system_list">touch sounds</string>
 
     <!-- [CHAR LIMIT=80] Zen mode settings: Allow reminder notifications/sounds to bypass DND  -->
-    <string name="zen_mode_reminders">Allow reminders</string>
+    <string name="zen_mode_reminders">Reminders</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow reminder notifications/sounds to bypass DND summary  -->
+    <string name="zen_mode_reminders_summary">From tasks and reminders</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders (ie: calendar reminders are allowed to bypass dnd) -->
     <string name="zen_mode_reminders_list">reminders</string>
 
     <!-- [CHAR LIMIT=80] Zen mode settings: Allow event notifications/sounds to bypass DND -->
-    <string name="zen_mode_events">Allow events</string>
+    <string name="zen_mode_events">Events</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow event notifications/sounds to bypass DND summary -->
+    <string name="zen_mode_events_summary">From upcoming calendar events</string>
 
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND -->
     <string name="zen_mode_bypassing_apps">Allow apps to override</string>
@@ -9447,7 +9482,7 @@
     <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
     <string name="allow_overlay_description">Allow this app to display on top of other apps you\u2019re using. It may interfere with your use of those apps or change the way they seem to appear or behave.</string>
 
-    <!-- Manager External Storage settings title [CHAR LIMIT=30] -->
+    <!-- Manager External Storage settings title [CHAR LIMIT=40] -->
     <string name="manage_external_storage_title">All files access</string>
     <!-- Label for a setting which controls whether an app can manage external storage [CHAR LIMIT=45] -->
     <string name="permit_manage_external_storage">Allow access to manage all files</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 47e96d8..05191b8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -564,8 +564,9 @@
         <item name="android:showDividers">middle</item>
     </style>
 
-    <style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault">
+    <style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textAllCaps">false</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
     </style>
 
     <style name="AccessibilityDialogServiceIcon">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9c50ceb..76d6e38 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -253,4 +253,8 @@
         <item name="android:colorPrimaryDark">@android:color/white</item>
         <item name="android:colorAccent">@color/material_blue_700</item>
     </style>
+    <!-- Material theme for the pages containing TabLayout and ViewPager -->
+    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
+    </style>
 </resources>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index 0351faf..70cb9c8 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -20,14 +20,37 @@
     android:key="autoclick_preference_screen"
     android:title="@string/accessibility_autoclick_preference_title">
 
+    <com.android.settingslib.widget.RadioButtonPreference
+        android:key="accessibility_control_autoclick_default"
+        android:title="@string/accessibility_autoclick_default_title"
+        settings:allowDividerAbove="true" />
+
+    <com.android.settingslib.widget.RadioButtonPreference
+        android:key="accessibility_control_autoclick_200ms"
+        android:title="@string/accessibility_autoclick_short_title"
+        android:summary="@string/accessibility_autoclick_short_summary" />
+
+    <com.android.settingslib.widget.RadioButtonPreference
+        android:key="accessibility_control_autoclick_600ms"
+        android:title="@string/accessibility_autoclick_medium_title"
+        android:summary="@string/accessibility_autoclick_medium_summary" />
+
+    <com.android.settingslib.widget.RadioButtonPreference
+        android:key="accessibility_control_autoclick_1sec"
+        android:title="@string/accessibility_autoclick_long_title"
+        android:summary="@string/accessibility_autoclick_long_summary" />
+
+    <com.android.settingslib.widget.RadioButtonPreference
+        android:key="accessibility_control_autoclick_custom"
+        android:title="@string/accessibility_autoclick_custom_title" />
 
     <com.android.settings.widget.SeekBarPreference
-        android:key="autoclick_delay"
-        android:title="@string/accessibility_autoclick_delay_preference_title" />
+        android:key="autoclick_delay" />
 
     <com.android.settingslib.widget.FooterPreference
         android:key="autoclick_footer"
         android:title="@string/accessibility_autoclick_description"
         android:selectable="false"
         settings:searchable="false"/>
+
 </PreferenceScreen>
diff --git a/res/xml/accessibility_magnification_service_settings.xml b/res/xml/accessibility_magnification_service_settings.xml
index d67fc66..74765b2 100644
--- a/res/xml/accessibility_magnification_service_settings.xml
+++ b/res/xml/accessibility_magnification_service_settings.xml
@@ -28,9 +28,11 @@
         settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />
 
     <SwitchPreference
-        android:key="magnification_window_control_switch"
+        android:key="magnification_enable"
         android:persistent="false"
-        android:summary="@string/accessibility_magnification_window_control_switch_summary"
-        android:title="@string/accessibility_magnification_window_control_switch_title"
-        settings:controller="com.android.settings.accessibility.MagnificationWindowControlPreferenceController" />
+        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:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />
+
 </PreferenceScreen>
diff --git a/res/xml/accessibility_magnification_settings.xml b/res/xml/accessibility_magnification_settings.xml
index 7415644..bb40394 100644
--- a/res/xml/accessibility_magnification_settings.xml
+++ b/res/xml/accessibility_magnification_settings.xml
@@ -17,7 +17,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="magnification_preference_screen_title"
-    android:title="@string/accessibility_screen_magnification_title">
+    android:title="@string/accessibility_screen_magnification_title"
+    settings:searchable="false">
     <Preference
         android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
         android:key="screen_magnification_gestures_preference_screen"
diff --git a/res/xml/accessibility_notification_vibration_settings.xml b/res/xml/accessibility_notification_vibration_settings.xml
index b6bc08c..b37d363 100644
--- a/res/xml/accessibility_notification_vibration_settings.xml
+++ b/res/xml/accessibility_notification_vibration_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="accessibility_notification_vibration_screen"
     android:title="@string/accessibility_notification_vibration_title" />
diff --git a/res/xml/accessibility_ring_vibration_settings.xml b/res/xml/accessibility_ring_vibration_settings.xml
index 121eb89..078f76c 100644
--- a/res/xml/accessibility_ring_vibration_settings.xml
+++ b/res/xml/accessibility_ring_vibration_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="accessibility_ring_vibration_screen"
     android:title="@string/accessibility_ring_vibration_title" />
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index d83fa59..be644d4 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -182,6 +182,12 @@
             settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
 
         <Preference
+            android:key="rtt_setting"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/rtt_settings_title"
+            settings:controller="com.android.settings.accessibility.RTTSettingPreferenceController"/>
+
+        <Preference
             android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
             android:key="captioning_preference_screen"
             android:persistent="false"
diff --git a/res/xml/accessibility_shortcut_service_settings.xml b/res/xml/accessibility_shortcut_service_settings.xml
index b2f1327..573939a 100644
--- a/res/xml/accessibility_shortcut_service_settings.xml
+++ b/res/xml/accessibility_shortcut_service_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="accessibility_shortcut_service_screen"
     android:title="@string/accessibility_shortcut_service_title" />
diff --git a/res/xml/accessibility_shortcut_settings.xml b/res/xml/accessibility_shortcut_settings.xml
index 9e1d26f..f431dec 100644
--- a/res/xml/accessibility_shortcut_settings.xml
+++ b/res/xml/accessibility_shortcut_settings.xml
@@ -15,7 +15,6 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:key="accessibility_shortcut_settings_screen"
                   android:title="@string/accessibility_global_gesture_preference_title" >
 
     <Preference
diff --git a/res/xml/accessibility_touch_vibration_settings.xml b/res/xml/accessibility_touch_vibration_settings.xml
index 4f0f761..ed8f550 100644
--- a/res/xml/accessibility_touch_vibration_settings.xml
+++ b/res/xml/accessibility_touch_vibration_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="accessibility_touch_vibration_screen"
     android:title="@string/accessibility_touch_vibration_title" />
diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
new file mode 100644
index 0000000..c541fe4
--- /dev/null
+++ b/res/xml/all_tether_prefs.xml
@@ -0,0 +1,66 @@
+<?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:key="tether_prefs_screen"
+    android:title="@string/tether_settings_title_all">
+
+    <PreferenceCategory
+        android:key="wifi_tether_settings_group"
+        android:title="@string/wifi_hotspot_checkbox_text"
+        settings:searchable="false">
+        <com.android.settings.wifi.tether.WifiTetherSsidPreference
+            android:key="wifi_tether_network_name"
+            android:title="@string/wifi_hotspot_name_title"
+            android:summary="@string/summary_placeholder"/>
+
+        <com.android.settings.widget.ValidatedEditTextPreference
+            android:key="wifi_tether_network_password"
+            android:persistent="false"
+            android:title="@string/wifi_hotspot_password_title"/>
+
+        <SwitchPreference
+            android:key="wifi_tether_auto_turn_off"
+            android:title="@string/wifi_hotspot_auto_off_title"
+            android:summary="@string/wifi_hotspot_auto_off_summary"/>
+
+        <ListPreference
+            android:key="wifi_tether_security"
+            android:title="@string/wifi_security"
+            android:summary="@string/summary_placeholder"
+            android:entries="@array/wifi_tether_security"
+            android:entryValues="@array/wifi_tether_security_values"/>
+
+        <ListPreference
+            android:key="wifi_tether_network_ap_band"
+            android:title="@string/wifi_hotspot_ap_band_title"/>
+    </PreferenceCategory>
+
+    <Preference
+        android:key="disabled_on_data_saver"
+        android:summary="@string/tether_settings_disabled_on_data_saver"
+        android:selectable="false"
+        settings:allowDividerAbove="true" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="tether_prefs_footer"
+        android:title="@string/tethering_footer_info"
+        android:selectable="false"
+        settings:searchable="false"/>
+</PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 9256f50..f75bd86 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -79,7 +79,6 @@
         android:key="app_and_notif_cell_broadcast_settings"
         android:title="@string/cell_broadcast_settings"
         android:order="15"
-        settings:searchable="false"
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml
index 08d4185..1428741 100644
--- a/res/xml/automatic_storage_management_settings.xml
+++ b/res/xml/automatic_storage_management_settings.xml
@@ -16,7 +16,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:key="automatic_storage_manager_screen"
         android:title="@string/automatic_storage_manager_settings" >
 
         <DropDownPreference
diff --git a/res/xml/battery_saver_schedule_settings.xml b/res/xml/battery_saver_schedule_settings.xml
index 98f39e3..f91e4ca 100644
--- a/res/xml/battery_saver_schedule_settings.xml
+++ b/res/xml/battery_saver_schedule_settings.xml
@@ -18,7 +18,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="battery_saver_schedule_screen"
     android:title="@string/battery_saver_schedule_settings_title"
     settings:staticPreferenceLocation="append">
 </PreferenceScreen >
diff --git a/res/xml/bluetooth_pairing_detail.xml b/res/xml/bluetooth_pairing_detail.xml
index cd9c324..86fb9e4 100644
--- a/res/xml/bluetooth_pairing_detail.xml
+++ b/res/xml/bluetooth_pairing_detail.xml
@@ -17,7 +17,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="bluetooth_pairing_detail_screen"
     android:title="@string/bluetooth_pairing_pref_title">
 
     <Preference
diff --git a/res/xml/bug_report_handler_settings.xml b/res/xml/bug_report_handler_settings.xml
index 7d5068c..41e8f08 100644
--- a/res/xml/bug_report_handler_settings.xml
+++ b/res/xml/bug_report_handler_settings.xml
@@ -18,7 +18,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="bug_report_handler_screen"
     android:title="@string/bug_report_handler_title"
     settings:staticPreferenceLocation="append" >
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/current_dream_settings.xml b/res/xml/current_dream_settings.xml
index b3f3f9f..d95e830 100644
--- a/res/xml/current_dream_settings.xml
+++ b/res/xml/current_dream_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="current_screensaver_screen"
     android:title="@string/screensaver_settings_current" />
diff --git a/res/xml/default_voice_settings.xml b/res/xml/default_voice_settings.xml
index 511294c..f75b5ed 100644
--- a/res/xml/default_voice_settings.xml
+++ b/res/xml/default_voice_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="voice_input_settings_screen"
     android:title="@string/voice_input_settings_title" />
diff --git a/res/xml/enterprise_set_default_apps_settings.xml b/res/xml/enterprise_set_default_apps_settings.xml
index 12eca8a..474a5c9 100644
--- a/res/xml/enterprise_set_default_apps_settings.xml
+++ b/res/xml/enterprise_set_default_apps_settings.xml
@@ -17,8 +17,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:key="enterprise_set_default_apps_settings"
-                  android:title="@string/enterprise_privacy_enterprise_set_default_apps">
+                  android:key="enterprise_set_default_apps_settings">
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
 </PreferenceScreen>
diff --git a/res/xml/network_scorer_picker_prefs.xml b/res/xml/network_scorer_picker_prefs.xml
index 7d1fe46..fab69e7 100644
--- a/res/xml/network_scorer_picker_prefs.xml
+++ b/res/xml/network_scorer_picker_prefs.xml
@@ -17,6 +17,5 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:key="network_scorer_picker_screen"
         android:title="@string/network_scorer_picker_title">
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/spellchecker_prefs.xml b/res/xml/spellchecker_prefs.xml
index 26476f4..666b0a9 100644
--- a/res/xml/spellchecker_prefs.xml
+++ b/res/xml/spellchecker_prefs.xml
@@ -16,7 +16,6 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="spellcheckers_screen"
     android:title="@string/spellcheckers_settings_title">
     <Preference
         android:key="spellchecker_language"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index cf6dd4d..54c49e8 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -18,7 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="tether_prefs_screen"
-    settings:keywords="@string/keywords_hotspot_tethering"
     android:title="@string/tether_settings_title_all">
 
     <com.android.settings.widget.FixedLineSummaryPreference
diff --git a/res/xml/usb_default_fragment.xml b/res/xml/usb_default_fragment.xml
index f08c9f4..b8d5e53 100644
--- a/res/xml/usb_default_fragment.xml
+++ b/res/xml/usb_default_fragment.xml
@@ -16,6 +16,6 @@
   -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/usb_default_label"
+    android:title="@string/usb_pref"
     android:key="usb_default_fragment">
 </PreferenceScreen>
diff --git a/res/xml/vr_display_settings.xml b/res/xml/vr_display_settings.xml
index 9522af5..d04435a 100644
--- a/res/xml/vr_display_settings.xml
+++ b/res/xml/vr_display_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="display_vr_pref_screen"
     android:title="@string/display_vr_pref_title" />
diff --git a/res/xml/webview_app_settings.xml b/res/xml/webview_app_settings.xml
index 51e472d..c7a611a 100644
--- a/res/xml/webview_app_settings.xml
+++ b/res/xml/webview_app_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="select_webview_provider_screen"
     android:title="@string/select_webview_provider_title" />
diff --git a/res/xml/when_to_dream_settings.xml b/res/xml/when_to_dream_settings.xml
index 13f5ae4..7b91a34 100644
--- a/res/xml/when_to_dream_settings.xml
+++ b/res/xml/when_to_dream_settings.xml
@@ -17,5 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="screensaver_when_to_dream_screen"
     android:title="@string/screensaver_settings_when_to_dream" />
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 1859a1e..41d101b 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -51,10 +51,12 @@
     <Preference
         android:key="install_credentials"
         android:title="@string/wifi_install_credentials">
-        <intent android:action="android.credentials.INSTALL_AS_USER"
-                android:targetPackage="com.android.certinstaller"
-                android:targetClass="com.android.certinstaller.CertInstallerMain">
-            <extra android:name="install_as_uid" android:value="1010" />
+        <intent
+            android:action="android.credentials.INSTALL"
+            android:targetPackage="com.android.certinstaller"
+            android:targetClass="com.android.certinstaller.CertInstallerMain">
+            <!-- Same value as CERTIFICATE_USAGE_WIFI in keystore/java/android/security/Credentials.java -->
+            <extra android:name="certificate_install_usage" android:value="wifi"/>
         </intent>
     </Preference>
 
diff --git a/res/xml/wifi_p2p_settings.xml b/res/xml/wifi_p2p_settings.xml
index f594797..405d081 100644
--- a/res/xml/wifi_p2p_settings.xml
+++ b/res/xml/wifi_p2p_settings.xml
@@ -16,7 +16,6 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="wifi_p2p_settings_screen"
     android:title="@string/wifi_p2p_settings_title">
     <Preference
         android:key="p2p_this_device"
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index c521675..3a3bdc4 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -19,7 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="wifi_tether_settings_screen"
-    android:title="@string/wifi_hotspot_checkbox_text">
+    android:title="@string/wifi_hotspot_checkbox_text"
+    settings:searchable="false">
 
     <com.android.settings.wifi.tether.WifiTetherSsidPreference
         android:key="wifi_tether_network_name"
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml
index 4616cf8..8366b09 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/xml/zen_mode_calls_settings.xml
@@ -21,26 +21,26 @@
     android:key="zen_mode_calls_settings_page"
     android:title="@string/zen_mode_calls_title" >
 
-   <PreferenceCategory
-       android:title="@string/zen_mode_settings_category"
-       android:key="zen_mode_settings_category_calls">
-      <!-- Calls -->
-      <ListPreference
-          android:key="zen_mode_calls"
-          android:title="@string/zen_mode_calls"
-          android:entries="@array/zen_mode_contacts_calls_entries"
-          android:entryValues="@array/zen_mode_contacts_values"/>
+    <PreferenceCategory
+        android:title="@string/zen_mode_settings_category"
+        android:key="zen_mode_settings_category_calls">
+        <!-- Calls -->
+        <ListPreference
+            android:key="zen_mode_calls"
+            android:title="@string/zen_mode_calls"
+            android:entries="@array/zen_mode_contacts_calls_entries"
+            android:entryValues="@array/zen_mode_contacts_values"/>
 
-      <Preference
-          android:key="zen_mode_starred_contacts_callers"
-          android:title="@string/zen_mode_starred_contacts_title"/>
+        <Preference
+            android:key="zen_mode_starred_contacts_callers"
+            android:title="@string/zen_mode_starred_contacts_title"/>
 
-      <!-- Repeat callers -->
-      <SwitchPreference
-          android:key="zen_mode_repeat_callers"
-          android:title="@string/zen_mode_repeat_callers_title" />
-   </PreferenceCategory>
+        <!-- Repeat callers -->
+        <SwitchPreference
+            android:key="zen_mode_repeat_callers"
+            android:title="@string/zen_mode_repeat_callers_title" />
+    </PreferenceCategory>
 
-   <com.android.settingslib.widget.FooterPreference/>
+    <com.android.settingslib.widget.FooterPreference/>
 
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_custom_rule_configuration.xml b/res/xml/zen_mode_custom_rule_configuration.xml
index c1732a3..664c09a 100644
--- a/res/xml/zen_mode_custom_rule_configuration.xml
+++ b/res/xml/zen_mode_custom_rule_configuration.xml
@@ -36,27 +36,32 @@
         <!-- Alarms -->
         <SwitchPreference
             android:key="zen_rule_alarms"
-            android:title="@string/zen_mode_alarms"/>
+            android:title="@string/zen_mode_alarms"
+            android:summary="@string/zen_mode_alarms_summary"/>
 
         <!-- Media -->
         <SwitchPreference
             android:key="zen_rule_media"
-            android:title="@string/zen_mode_media"/>
+            android:title="@string/zen_mode_media"
+            android:summary="@string/zen_mode_media_summary"/>
 
         <!-- System -->
         <SwitchPreference
             android:key="zen_rule_system"
-            android:title="@string/zen_mode_system"/>
+            android:title="@string/zen_mode_system"
+            android:summary="@string/zen_mode_system_summary"/>
 
         <!-- Reminders -->
         <SwitchPreference
             android:key="zen_rule_reminders"
-            android:title="@string/zen_mode_reminders"/>
+            android:title="@string/zen_mode_reminders"
+            android:summary="@string/zen_mode_reminders_summary"/>
 
         <!-- Events -->
         <SwitchPreference
             android:key="zen_rule_events"
-            android:title="@string/zen_mode_events"/>
+            android:title="@string/zen_mode_events"
+            android:summary="@string/zen_mode_events_summary"/>
     </PreferenceCategory>
 
     <Preference
diff --git a/res/xml/zen_mode_people_settings.xml b/res/xml/zen_mode_people_settings.xml
new file mode 100644
index 0000000..5456f6f
--- /dev/null
+++ b/res/xml/zen_mode_people_settings.xml
@@ -0,0 +1,67 @@
+<?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:key="zen_mode_people_settings_page"
+    android:title="@string/zen_category_people" >
+
+   <PreferenceCategory
+       android:title="@string/zen_mode_calls_title"
+       android:key="zen_mode_settings_category_calls">
+      <!-- Calls -->
+      <ListPreference
+          android:key="zen_mode_calls"
+          android:title="@string/zen_mode_calls"
+          android:entries="@array/zen_mode_contacts_calls_entries"
+          android:entryValues="@array/zen_mode_contacts_values"/>
+
+      <Preference
+          android:key="zen_mode_starred_contacts_callers"
+          android:title="@string/zen_mode_starred_contacts_title"/>
+
+      <!-- Repeat callers -->
+      <SwitchPreference
+          android:key="zen_mode_repeat_callers"
+          android:title="@string/zen_mode_repeat_callers_title" />
+   </PreferenceCategory>
+
+   <PreferenceCategory
+       android:title="@string/zen_mode_messages_title"
+       android:key="zen_mode_settings_category_messages">
+      <!-- Messages -->
+      <ListPreference
+          android:key="zen_mode_messages"
+          android:title="@string/zen_mode_messages"
+          android:entries="@array/zen_mode_contacts_messages_entries"
+          android:entryValues="@array/zen_mode_contacts_values"/>
+
+      <Preference
+          android:key="zen_mode_starred_contacts_messages"
+          android:title="@string/zen_mode_starred_contacts_title"/>
+   </PreferenceCategory>
+
+   <PreferenceCategory
+       android:title="@string/zen_mode_conversations_title"
+       android:key="zen_mode_settings_category_conversations">
+   </PreferenceCategory>
+
+   <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
+   <com.android.settingslib.widget.FooterPreference/>
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 1a35031..13cf945 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -19,49 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="zen_mode_settings"
-    android:title="@string/zen_mode_settings_title">
-
-    <PreferenceCategory
-        android:key="zen_mode_settings_category_behavior"
-        android:title="@string/zen_category_behavior">
-        <!-- Calls -->
-        <Preference
-            android:key="zen_mode_behavior_calls"
-            android:title="@string/zen_mode_calls_title"
-            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
-
-        <!-- Messages -->
-        <Preference
-            android:key="zen_mode_behavior_messages"
-            android:title="@string/zen_mode_messages_title"
-            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
-
-        <!-- All sounds -->
-        <Preference
-            android:key="zen_sound_vibration_settings"
-            android:title="@string/zen_sound_title"
-            android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings"
-            android:icon="@drawable/ic_chevron_right_24dp"/>
-    </PreferenceCategory>
-
-    <!-- What to block (effects) -->
-    <Preference
-        android:key="zen_mode_block_effects_settings"
-        android:title="@string/zen_mode_restrict_notifications_title"
-        android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings"
-        settings:allowDividerAbove="true"/>
-
-    <!-- DND duration settings -->
-    <com.android.settings.notification.zen.ZenDurationDialogPreference
-        android:key="zen_mode_duration_settings"
-        android:title="@string/zen_mode_duration_settings_title"
-        android:widgetLayout="@null"/>
-
-    <!-- Automatic rules -->
-    <Preference
-        android:key="zen_mode_automation_settings"
-        android:title="@string/zen_mode_automation_settings_title"
-        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+    android:title=" ">
 
     <!-- Turn on DND button -->
     <com.android.settingslib.widget.LayoutPreference
@@ -73,6 +31,53 @@
         settings:allowDividerBelow="true"
         settings:keywords="@string/keywords_zen_mode_settings"/>
 
+    <PreferenceCategory
+        android:key="zen_mode_settings_category_behavior"
+        android:title="@string/zen_category_behavior">
+        <!-- People -->
+        <Preference
+            android:key="zen_mode_behavior_people"
+            android:title="@string/zen_category_people"
+            android:fragment="com.android.settings.notification.zen.ZenModePeopleSettings" />
+
+        <!-- Apps -->
+        <Preference
+            android:key="zen_mode_behavior_apps"
+            android:title="@string/zen_category_apps"
+            android:fragment="com.android.settings.notification.zen.ZenModeBypassingAppsSettings" />
+
+        <!-- All sounds -->
+        <Preference
+            android:key="zen_sound_vibration_settings"
+            android:title="@string/zen_category_exceptions"
+            android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings" />
+    </PreferenceCategory>
+
+    <!-- Automatic rules -->
+    <Preference
+        android:key="zen_mode_automation_settings"
+        android:title="@string/zen_mode_automation_settings_title"
+        settings:allowDividerAbove="true"
+        settings:allowDividerBelow="true"
+        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+
+    <PreferenceCategory
+        android:key="zen_mode_settings_advanced"
+        settings:initialExpandedChildrenCount="1">
+
+        <!-- What to block (effects) -->
+        <Preference
+            android:key="zen_mode_block_effects_settings"
+            android:title="@string/zen_mode_restrict_notifications_title"
+            android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings" />
+
+        <!-- DND duration settings -->
+        <com.android.settings.notification.zen.ZenDurationDialogPreference
+            android:key="zen_mode_duration_settings"
+            android:title="@string/zen_mode_duration_settings_title"
+            android:widgetLayout="@null"/>
+    </PreferenceCategory>
+
     <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
     <com.android.settingslib.widget.FooterPreference/>
 
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index b43bdcc..4aacda3 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -24,48 +24,35 @@
         android:title="@string/zen_mode_settings_category"
         android:key="zen_mode_settings_category_sound_vibration">
 
-        <!-- Calls -->
-        <Preference
-            android:key="zen_mode_calls_settings"
-            android:title="@string/zen_mode_calls"
-            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
-
-        <!-- Messages -->
-        <Preference
-            android:key="zen_mode_messages_settings"
-            android:title="@string/zen_mode_messages"
-            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
-
         <!-- Alarms -->
         <SwitchPreference
             android:key="zen_mode_alarms"
-            android:title="@string/zen_mode_alarms"/>
+            android:title="@string/zen_mode_alarms"
+            android:summary="@string/zen_mode_alarms_summary"/>
 
         <!-- Media -->
         <SwitchPreference
             android:key="zen_mode_media"
-            android:title="@string/zen_mode_media"/>
+            android:title="@string/zen_mode_media"
+            android:summary="@string/zen_mode_media_summary"/>
 
         <!-- System -->
         <SwitchPreference
             android:key="zen_mode_system"
-            android:title="@string/zen_mode_system"/>
+            android:title="@string/zen_mode_system"
+            android:summary="@string/zen_mode_system_summary"/>
 
         <!-- Reminders -->
         <SwitchPreference
             android:key="zen_mode_reminders"
-            android:title="@string/zen_mode_reminders"/>
+            android:title="@string/zen_mode_reminders"
+            android:summary="@string/zen_mode_reminders_summary"/>
 
         <!-- Events -->
         <SwitchPreference
             android:key="zen_mode_events"
-            android:title="@string/zen_mode_events"/>
-
-        <!-- Apps overriding DND -->
-        <Preference
-            android:key="zen_mode_bypassing_apps"
-            android:title="@string/zen_mode_bypassing_apps"
-            android:fragment="com.android.settings.notification.zen.ZenModeBypassingAppsSettings"/>
+            android:title="@string/zen_mode_events"
+            android:summary="@string/zen_mode_events_summary"/>
 
     </PreferenceCategory>
 
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
new file mode 100644
index 0000000..d6366b2
--- /dev/null
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -0,0 +1,399 @@
+/*
+ * 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;
+
+import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
+import static android.net.ConnectivityManager.TETHERING_WIFI;
+import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
+
+import static com.android.settings.network.WifiTetherDisablePreferenceController
+        .KEY_ENABLE_WIFI_TETHERING;
+
+import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.datausage.DataSaverBackend;
+import com.android.settings.network.TetherEnabler;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.wifi.tether.WifiTetherApBandPreferenceController;
+import com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceController;
+import com.android.settings.wifi.tether.WifiTetherBasePreferenceController;
+import com.android.settings.wifi.tether.WifiTetherPasswordPreferenceController;
+import com.android.settings.wifi.tether.WifiTetherSSIDPreferenceController;
+import com.android.settings.wifi.tether.WifiTetherSecurityPreferenceController;
+import com.android.settingslib.TetherUtil;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Displays preferences for Tethering.
+ * TODO(b/147322704): Use TetherEnabler in this fragment to manage tethering switch on/off.
+ * TODO(b/147323306): Add tether option preferences into this fragment after controllers created.
+ */
+@SearchIndexable
+public final class AllInOneTetherSettings extends RestrictedDashboardFragment
+        implements DataSaverBackend.Listener,
+        WifiTetherBasePreferenceController.OnTetherConfigUpdateListener,
+        SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @VisibleForTesting
+    static final String KEY_TETHER_PREFS_SCREEN = "tether_prefs_screen";
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_PASSWORD = "wifi_tether_network_password";
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_AUTO_OFF = "wifi_tether_auto_turn_off";
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_AP_BAND = "wifi_tether_network_ap_band";
+
+    private static final String KEY_WIFI_TETHER_GROUP = "wifi_tether_settings_group";
+    private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver";
+    private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
+    private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+    private static final String TAG = "AllInOneTetherSettings";
+
+    private boolean mUnavailable;
+
+    private DataSaverBackend mDataSaverBackend;
+    private boolean mDataSaverEnabled;
+    private Preference mDataSaverFooter;
+
+    private WifiManager mWifiManager;
+    private boolean mRestartWifiApAfterConfigChange;
+
+    private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
+    private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
+    private WifiTetherApBandPreferenceController mApBandPreferenceController;
+    private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+    private PreferenceGroup mWifiTetherGroup;
+    private SharedPreferences mSharedPreferences;
+    private ConnectivityManager mConnectivityManager;
+    private boolean mWifiTetherChosen;
+
+    private final BroadcastReceiver mTetherChangeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context content, Intent intent) {
+            String action = intent.getAction();
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "updating display config due to receiving broadcast action " + action);
+            }
+            updateDisplayWithNewConfig();
+            if (TextUtils.equals(action, ACTION_TETHER_STATE_CHANGED)) {
+                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED
+                        && mRestartWifiApAfterConfigChange) {
+                    mRestartWifiApAfterConfigChange = false;
+                    startTether();
+                }
+            } else if (TextUtils.equals(action, WIFI_AP_STATE_CHANGED_ACTION)) {
+                int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
+                if (state == WifiManager.WIFI_AP_STATE_DISABLED
+                        && mRestartWifiApAfterConfigChange) {
+                    mRestartWifiApAfterConfigChange = false;
+                    startTether();
+                }
+            }
+        }
+    };
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.TETHER;
+    }
+
+    public AllInOneTetherSettings() {
+        super(UserManager.DISALLOW_CONFIG_TETHERING);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mConnectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mSharedPreferences =
+                context.getSharedPreferences(TetherEnabler.SHARED_PREF, Context.MODE_PRIVATE);
+
+        mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class);
+        mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class);
+        mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
+        mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class);
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mDataSaverBackend = new DataSaverBackend(getContext());
+        mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
+        mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);
+        mWifiTetherGroup = findPreference(KEY_WIFI_TETHER_GROUP);
+
+        setIfOnlyAvailableForAdmins(true);
+        if (isUiRestricted()) {
+            mUnavailable = true;
+            return;
+        }
+
+        mDataSaverBackend.addListener(this);
+
+        // Set initial state based on Data Saver mode.
+        onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
+
+        // Set initial state based on SharedPreferences value.
+        onSharedPreferenceChanged(mSharedPreferences, KEY_ENABLE_WIFI_TETHERING);
+
+        // TODO(b/147325229): Hide advanced settings like security and ap band.
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (mUnavailable) {
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.tethering_settings_not_available);
+            }
+            getPreferenceScreen().removeAll();
+            return;
+        }
+        final Context context = getContext();
+        if (context != null) {
+            IntentFilter filter = new IntentFilter(ACTION_TETHER_STATE_CHANGED);
+            filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
+            context.registerReceiver(mTetherChangeReceiver, filter);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        final Context context = getContext();
+        if (context != null) {
+            context.unregisterReceiver(mTetherChangeReceiver);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        mDataSaverBackend.remListener(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onDataSaverChanged(boolean isDataSaving) {
+        mDataSaverEnabled = isDataSaving;
+        mDataSaverFooter.setVisible(mDataSaverEnabled);
+    }
+
+    @Override
+    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+        // Do nothing
+    }
+
+    @Override
+    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+        // Do nothing
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, this);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(
+                new WifiTetherSSIDPreferenceController(context, listener));
+        controllers.add(
+                new WifiTetherPasswordPreferenceController(context, listener));
+        controllers.add(
+                new WifiTetherApBandPreferenceController(context, listener));
+        controllers.add(
+                new WifiTetherSecurityPreferenceController(context, listener));
+        controllers.add(
+                new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));
+
+        return controllers;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.all_tether_prefs;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public void onExpandButtonClick() {
+        super.onExpandButtonClick();
+        // TODO(b/147325229): Display hidden advanced settings like security and ap band.
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_tether;
+    }
+
+    @Override
+    public void onTetherConfigUpdated(AbstractPreferenceController controller) {
+        final SoftApConfiguration config = buildNewConfig();
+        mPasswordPreferenceController.updateVisibility(config.getSecurityType());
+        mWifiManager.setSoftApConfiguration(config);
+
+        if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "Wifi AP config changed while enabled, stop and restart");
+            }
+            mRestartWifiApAfterConfigChange = true;
+            // TODO(b/147322704): Use TethetEnabler to stop tethering.
+            mConnectivityManager.stopTethering(TETHERING_WIFI);
+        }
+
+        if (controller instanceof WifiTetherSecurityPreferenceController) {
+            reConfigInitialExpandedChildCount();
+        }
+    }
+
+    private SoftApConfiguration buildNewConfig() {
+        final SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
+        final int securityType = mSecurityPreferenceController.getSecurityType();
+        configBuilder.setSsid(mSSIDPreferenceController.getSSID());
+        if (securityType == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK) {
+            configBuilder.setPassphrase(
+                    mPasswordPreferenceController.getPasswordValidated(securityType),
+                    SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
+        }
+        configBuilder.setBand(mApBandPreferenceController.getBandIndex());
+        return configBuilder.build();
+    }
+
+    private void updateDisplayWithNewConfig() {
+        mSSIDPreferenceController.updateDisplay();
+        mSecurityPreferenceController.updateDisplay();
+        mPasswordPreferenceController.updateDisplay();
+        mApBandPreferenceController.updateDisplay();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (TextUtils.equals(key, KEY_ENABLE_WIFI_TETHERING)) {
+            mWifiTetherChosen = sharedPreferences.getBoolean(KEY_ENABLE_WIFI_TETHERING, true);
+            mWifiTetherGroup.setVisible(mWifiTetherChosen);
+            reConfigInitialExpandedChildCount();
+        }
+    }
+
+    private void startTether() {
+        // TODO(b/147322704): Use TetherEnabler to start tethering.
+        if (mWifiManager.isWifiApEnabled()) {
+            return;
+        }
+        mConnectivityManager.startTethering(ConnectivityManager.TETHERING_WIFI,
+                true /*showProvisioningUi*/,
+                new ConnectivityManager.OnStartTetheringCallback() {
+                    @Override
+                    public void onTetheringFailed() {
+                        super.onTetheringFailed();
+                        // Do nothing. There is no UI to update at this point.
+                    }
+                },
+                new Handler(Looper.getMainLooper()));
+    }
+
+    private void reConfigInitialExpandedChildCount() {
+        getPreferenceScreen().setInitialExpandedChildrenCount(getInitialExpandedChildCount());
+    }
+
+    @Override
+    public int getInitialExpandedChildCount() {
+        if (!mWifiTetherChosen) {
+            // Expand all preferences in the screen.
+            return getPreferenceScreen().getPreferenceCount();
+        }
+
+        if (mSecurityPreferenceController == null) {
+            return EXPANDED_CHILD_COUNT_DEFAULT;
+        }
+
+        return (mSecurityPreferenceController.getSecurityType()
+                == SoftApConfiguration.SECURITY_TYPE_OPEN)
+                ? EXPANDED_CHILD_COUNT_WITH_SECURITY_NON : EXPANDED_CHILD_COUNT_DEFAULT;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.all_tether_prefs) {
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+
+                    if (!TetherUtil.isTetherAvailable(context)) {
+                        keys.add(KEY_TETHER_PREFS_SCREEN);
+                        keys.add(KEY_WIFI_TETHER_NETWORK_NAME);
+                        keys.add(KEY_WIFI_TETHER_NETWORK_PASSWORD);
+                        keys.add(KEY_WIFI_TETHER_AUTO_OFF);
+                        keys.add(KEY_WIFI_TETHER_NETWORK_AP_BAND);
+                    }
+
+                    return keys;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> createPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null /* AllTetherSettings */);
+                }
+            };
+}
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 4a31897..4e8e8fe 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -60,7 +60,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
@@ -916,9 +915,7 @@
      *    phone that has no encryption.
      */
     private final void setAirplaneModeIfNecessary() {
-        final boolean isLteDevice =
-                getTelephonyManager().getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
-        if (!isLteDevice) {
+        if (!getTelephonyManager().isGlobalModeEnabled()) {
             Log.d(TAG, "Going into airplane mode.");
             Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
             final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index e2adcc7..733d7fe 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -40,11 +40,9 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.Spinner;
-import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -121,10 +119,11 @@
         if (mSubscriptions != null && mSubscriptions.size() > 0) {
             int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
             SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);
-            args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());
+            args.putInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
+                    subscription.getSubscriptionId());
         }
         args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA,
-            mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());
+                mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());
         new SubSettingLauncher(getContext())
                 .setDestination(ResetNetworkConfirm.class.getName())
                 .setArguments(args)
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index f4b20eb..6856a5a 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -47,7 +47,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settings.network.ApnSettings;
@@ -250,7 +249,7 @@
 
         Bundle args = getArguments();
         if (args != null) {
-            mSubId = args.getInt(PhoneConstants.SUBSCRIPTION_KEY,
+            mSubId = args.getInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
                     SubscriptionManager.INVALID_SUBSCRIPTION_ID);
             mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
         }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index d5c0871..83ee3fd 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -139,6 +139,7 @@
     public static class AppMemoryUsageActivity extends SettingsActivity { /* empty */ }
     public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageExternalStorageActivity extends SettingsActivity { /* empty */ }
+    public static class AppManageExternalStorageActivity extends SettingsActivity { /* empty */ }
     public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ChangeWifiStateActivity extends SettingsActivity { /* empty */ }
     public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 2f198cf..8a96484 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -81,7 +81,6 @@
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 import android.util.ArraySet;
-import android.util.FeatureFlagUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -101,7 +100,6 @@
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -372,7 +370,7 @@
     }
 
     public static boolean hasMultipleUsers(Context context) {
-        return ((UserManager) context.getSystemService(Context.USER_SERVICE))
+        return context.getSystemService(UserManager.class)
                 .getUsers().size() > 1;
     }
 
@@ -666,7 +664,7 @@
      * @throws SecurityException if the given userId does not belong to the current user group.
      */
     public static int enforceSameOwner(Context context, int userId) {
-        final UserManager um = UserManager.get(context);
+        final UserManager um = context.getSystemService(UserManager.class);
         final int[] profileIds = um.getProfileIdsWithDisabled(UserHandle.myUserId());
         if (ArrayUtils.contains(profileIds, userId)) {
             return userId;
@@ -686,7 +684,7 @@
      * Returns the user id of the credential owner of the given user id.
      */
     public static int getCredentialOwnerUserId(Context context, int userId) {
-        final UserManager um = UserManager.get(context);
+        final UserManager um = context.getSystemService(UserManager.class);
         return um.getCredentialOwnerProfile(userId);
     }
 
@@ -823,7 +821,8 @@
     }
 
     public static boolean isDemoUser(Context context) {
-        return UserManager.isDeviceInDemoMode(context) && UserManager.get(context).isDemoUser();
+        return UserManager.isDeviceInDemoMode(context)
+                && context.getSystemService(UserManager.class).isDemoUser();
     }
 
     public static ComponentName getDeviceOwnerComponent(Context context) {
@@ -1050,8 +1049,7 @@
                 == ProfileSelectFragment.ProfileType.PERSONAL : false;
         final boolean isWork = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
                 == ProfileSelectFragment.ProfileType.WORK : false;
-        if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.PERSONAL_WORK_PROFILE)
-                && UserManager.get(activity).getUserProfiles().size() > 1
+        if (activity.getSystemService(UserManager.class).getUserProfiles().size() > 1
                 && ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName) != null
                 && !isWork && !isPersonal) {
             f = Fragment.instantiate(activity, ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName),
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 3ff3217..d6c2a09 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -201,5 +201,11 @@
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_shortcut_settings);
+            new BaseSearchIndexProvider() {
+                // This fragment is for details of the shortcut. Only the shortcut itself needs
+                // to be indexed.
+                protected boolean isPageSearchEnabled(Context context) {
+                    return false;
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index 371afa1..fefb406 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -27,6 +27,7 @@
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 
@@ -67,7 +68,7 @@
             new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
 
     /**
-     * Annotation for different shortcut type UI type.
+     * Annotation for different user shortcut type UI type.
      *
      * {@code DEFAULT} for displaying default value.
      * {@code SOFTWARE} for displaying specifying the accessibility services or features which
@@ -79,14 +80,14 @@
      */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
-            PreferredShortcutType.DEFAULT,
-            PreferredShortcutType.SOFTWARE,
-            PreferredShortcutType.HARDWARE,
-            PreferredShortcutType.TRIPLETAP,
+            UserShortcutType.DEFAULT,
+            UserShortcutType.SOFTWARE,
+            UserShortcutType.HARDWARE,
+            UserShortcutType.TRIPLETAP,
     })
 
-    /** Denotes the shortcut type. */
-    public @interface PreferredShortcutType {
+    /** Denotes the user shortcut type. */
+    public @interface UserShortcutType {
         int DEFAULT = 0;
         int SOFTWARE = 1; // 1 << 0
         int HARDWARE = 2; // 1 << 1
@@ -160,42 +161,77 @@
     }
 
     /**
-     * Opts in component name into colon-separated {@code shortcutType} key's string in Settings.
+     * Opts in component name into multiple {@code shortcutTypes} colon-separated string in
+     * Settings.
+     *
+     * @param context The current context.
+     * @param shortcutTypes  A combination of {@link UserShortcutType}.
+     * @param componentName The component name that need to be opted in Settings.
+     */
+    static void optInAllValuesToSettings(Context context, int shortcutTypes,
+            @NonNull ComponentName componentName) {
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            optInValueToSettings(context, UserShortcutType.SOFTWARE, componentName);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            optInValueToSettings(context, UserShortcutType.HARDWARE, componentName);
+        }
+    }
+
+    /**
+     * Opts in component name into {@code shortcutType} colon-separated string in Settings.
      *
      * @param context The current context.
      * @param shortcutType The preferred shortcut type user selected.
      * @param componentName The component name that need to be opted in Settings.
      */
-    static void optInValueToSettings(Context context, @PreferredShortcutType int shortcutType,
+    @VisibleForTesting
+    static void optInValueToSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
         final String targetKey = convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
                 targetKey);
 
-        if (TextUtils.isEmpty(targetString)) {
-            return;
-        }
-
         if (hasValueInSettings(context, shortcutType, componentName)) {
             return;
         }
 
         final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-
-        joiner.add(targetString);
+        if (!TextUtils.isEmpty(targetString)) {
+            joiner.add(targetString);
+        }
         joiner.add(componentName.flattenToString());
 
         Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
     }
 
     /**
-     * Opts out component name into colon-separated {@code shortcutType} key's string in Settings.
+     * Opts out component name into multiple {@code shortcutTypes} colon-separated string in
+     * Settings.
+     *
+     * @param context The current context.
+     * @param shortcutTypes A combination of {@link UserShortcutType}.
+     * @param componentName The component name that need to be opted out from Settings.
+     */
+    static void optOutAllValuesFromSettings(Context context, int shortcutTypes,
+            @NonNull ComponentName componentName) {
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            optOutValueFromSettings(context, UserShortcutType.SOFTWARE, componentName);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            optOutValueFromSettings(context, UserShortcutType.HARDWARE, componentName);
+        }
+    }
+
+    /**
+     * Opts out component name into {@code shortcutType} colon-separated string in Settings.
      *
      * @param context The current context.
      * @param shortcutType The preferred shortcut type user selected.
      * @param componentName The component name that need to be opted out from Settings.
      */
-    static void optOutValueFromSettings(Context context, @PreferredShortcutType int shortcutType,
+    @VisibleForTesting
+    static void optOutValueFromSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
         final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
         final String targetKey = convertKeyFromSettings(shortcutType);
@@ -219,14 +255,35 @@
     }
 
     /**
-     * Returns if component name existed in Settings.
+     * Returns if component name existed in one of {@code shortcutTypes} string in Settings.
+     *
+     * @param context The current context.
+     * @param shortcutTypes A combination of {@link UserShortcutType}.
+     * @param componentName The component name that need to be checked existed in Settings.
+     * @return {@code true} if componentName existed in Settings.
+     */
+    static boolean hasValuesInSettings(Context context, int shortcutTypes,
+            @NonNull ComponentName componentName) {
+        boolean exist = false;
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            exist = hasValueInSettings(context, UserShortcutType.SOFTWARE, componentName);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            exist |= hasValueInSettings(context, UserShortcutType.HARDWARE, componentName);
+        }
+        return exist;
+    }
+
+    /**
+     * Returns if component name existed in {@code shortcutType} string Settings.
      *
      * @param context The current context.
      * @param shortcutType The preferred shortcut type user selected.
      * @param componentName The component name that need to be checked existed in Settings.
      * @return {@code true} if componentName existed in Settings.
      */
-    static boolean hasValueInSettings(Context context, @PreferredShortcutType int shortcutType,
+    @VisibleForTesting
+    static boolean hasValueInSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
         final String targetKey = convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
@@ -248,22 +305,42 @@
     }
 
     /**
-     * Converts {@link PreferredShortcutType} to key in Settings.
+     * Gets the corresponding user shortcut type of a given accessibility service.
+     *
+     * @param context The current context.
+     * @param componentName The component name that need to be checked existed in Settings.
+     * @return The user shortcut type if component name existed in {@code UserShortcutType} string
+     * Settings.
+     */
+    static int getUserShortcutTypesFromSettings(Context context,
+            @NonNull ComponentName componentName) {
+        int shortcutTypes = UserShortcutType.DEFAULT;
+        if (hasValuesInSettings(context, UserShortcutType.SOFTWARE, componentName)) {
+            shortcutTypes |= UserShortcutType.SOFTWARE;
+        }
+        if (hasValuesInSettings(context, UserShortcutType.HARDWARE, componentName)) {
+            shortcutTypes |= UserShortcutType.HARDWARE;
+        }
+        return shortcutTypes;
+    }
+
+    /**
+     * Converts {@link UserShortcutType} to key in Settings.
      *
      * @param shortcutType The shortcut type.
      * @return Mapping key in Settings.
      */
-    static String convertKeyFromSettings(@PreferredShortcutType int shortcutType) {
+    static String convertKeyFromSettings(@UserShortcutType int shortcutType) {
         switch (shortcutType) {
-            case PreferredShortcutType.SOFTWARE:
+            case UserShortcutType.SOFTWARE:
                 return Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT;
-            case PreferredShortcutType.HARDWARE:
+            case UserShortcutType.HARDWARE:
                 return Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
-            case PreferredShortcutType.TRIPLETAP:
+            case UserShortcutType.TRIPLETAP:
                 return Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
             default:
                 throw new IllegalArgumentException(
-                        "Unsupported preferredShortcutType " + shortcutType);
+                        "Unsupported userShortcutType " + shortcutType);
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
index 5771ffe..0fd3d06 100644
--- a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
+++ b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
@@ -92,6 +92,17 @@
 
     private final List<Preference> mPreferenceList = new ArrayList<>();
 
+    private final View.OnLayoutChangeListener mLayoutChangeListener =
+            new View.OnLayoutChangeListener() {
+                @Override
+                public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                        int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                    // Remove the listener once the callback is triggered.
+                    mPreviewViewport.removeOnLayoutChangeListener(this);
+                    refreshPreviewText();
+                }
+            };
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.ACCESSIBILITY_CAPTION_PROPERTIES;
@@ -111,14 +122,7 @@
         refreshPreviewText();
     }
 
-    private void setPreferenceViewEnabled(boolean enabled) {
-        for (Preference preference : mPreferenceList) {
-            preference.setEnabled(enabled);
-        }
-    }
-
     private void refreshPreferenceViewEnabled(boolean enabled) {
-        setPreferenceViewEnabled(enabled);
         mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
     }
 
@@ -198,9 +202,7 @@
         mPreviewWindow = captionPreview.findViewById(R.id.preview_window);
 
         mPreviewViewport = captionPreview.findViewById(R.id.preview_viewport);
-        mPreviewViewport.addOnLayoutChangeListener(
-                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom)
-                        -> refreshPreviewText());
+        mPreviewViewport.addOnLayoutChangeListener(mLayoutChangeListener);
 
         final Resources res = getResources();
         final int[] presetValues = res.getIntArray(R.array.captioning_preset_selector_values);
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index fe90845..0034fe6 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -70,16 +70,6 @@
         installUpdateListeners();
     }
 
-    private void setPreferenceViewEnabled(boolean enabled) {
-        for (Preference preference : mPreferenceList) {
-            preference.setEnabled(enabled);
-        }
-    }
-
-    private void refreshPreferenceViewEnabled(boolean enabled) {
-        setPreferenceViewEnabled(enabled);
-    }
-
     private void initializeAllPreferences() {
         mSwitch = (SwitchPreference) findPreference(PREF_SWITCH);
         mTextAppearance = (Preference) findPreference(PREF_TEXT);
@@ -87,8 +77,6 @@
 
         mPreferenceList.add(mTextAppearance);
         mPreferenceList.add(mMoreOptions);
-
-        refreshPreferenceViewEnabled(mCaptioningManager.isEnabled());
     }
 
     private void installUpdateListeners() {
@@ -105,7 +93,6 @@
         if (mSwitch == preference) {
             Settings.Secure.putInt(
                     cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, (boolean) value ? 1 : 0);
-            refreshPreferenceViewEnabled((boolean) value);
         }
 
         return true;
diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index ef658e0..a48b71f 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -18,9 +18,12 @@
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.os.Bundle;
+import android.view.View;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.accessibility.AccessibilityUtils;
 
 /**
  * For accessibility services that target SDK > Q, and
@@ -28,7 +31,7 @@
  * is set.
  */
 public class InvisibleToggleAccessibilityServicePreferenceFragment extends
-        ToggleAccessibilityServicePreferenceFragment {
+        ToggleAccessibilityServicePreferenceFragment implements ShortcutPreference.OnClickListener{
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -38,4 +41,33 @@
         final SwitchBar mSwitchBar = activity.getSwitchBar();
         mSwitchBar.hide();
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Enables accessibility service only when user had allowed permission. Disables
+     * accessibility service when shortcutPreference is unchecked.
+     */
+    @Override
+    public void onCheckboxClicked(ShortcutPreference preference) {
+        super.onCheckboxClicked(preference);
+        boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED)
+                && preference.getChecked();
+
+        AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Enables accessibility service when user clicks permission allow button.
+     */
+    @Override
+    void onDialogButtonFromShortcutClicked(View view) {
+        super.onDialogButtonFromShortcutClicked(view);
+        if (view.getId() == R.id.permission_enable_allow_button) {
+            AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName,
+                    true);
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java
index 4714fb3..13397a2 100644
--- a/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
 import android.os.Bundle;
 import android.view.View;
 
@@ -23,9 +25,12 @@
 
 import com.android.settings.R;
 
+import com.google.common.collect.ImmutableSet;
+
 /** For accessibility services that target SDK <= Q. */
 public class LegacyAccessibilityServicePreferenceFragment extends
         ToggleAccessibilityServicePreferenceFragment {
+
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -39,5 +44,15 @@
             shortcutPreference.setSummary(hardwareTitle);
             shortcutPreference.setSettingsVisibility(View.GONE);
         }
+        // Only allowed hardware PreferredShortcutType in this fragment.
+        setAllowedPreferredShortcutType(UserShortcutType.HARDWARE);
+    }
+
+    private void setAllowedPreferredShortcutType(int type) {
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                getComponentName().flattenToString(), type);
+
+        SharedPreferenceUtils.setUserShortcutType(getPrefContext(),
+                ImmutableSet.of(shortcut.flattenToString()));
     }
 }
diff --git a/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java b/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
new file mode 100644
index 0000000..a21c024
--- /dev/null
+++ b/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.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.accessibility;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+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/MagnificationWindowControlPreferenceController.java b/src/com/android/settings/accessibility/MagnificationWindowControlPreferenceController.java
deleted file mode 100644
index 4badc3f..0000000
--- a/src/com/android/settings/accessibility/MagnificationWindowControlPreferenceController.java
+++ /dev/null
@@ -1,60 +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.accessibility;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.settings.core.TogglePreferenceController;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/** Controller that shows and updates the magnification window control switch. */
-public class MagnificationWindowControlPreferenceController extends TogglePreferenceController {
-
-    // TODO(b/146019459): Use magnification_window_control_enabled.
-    private static final String KEY_CONTROL = Settings.System.MASTER_MONO;
-
-    public MagnificationWindowControlPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return Settings.System.getIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, State.OFF, UserHandle.USER_CURRENT) == State.ON;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        return Settings.System.putIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, isChecked ? State.ON : State.OFF, UserHandle.USER_CURRENT);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Retention(RetentionPolicy.SOURCE)
-    private @interface State {
-        int OFF = 0;
-        int ON = 1;
-    }
-}
diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
index c4d00ca..3ca197f 100644
--- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
@@ -21,13 +21,10 @@
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
 /**
  * Fragment for picking accessibility shortcut service
  */
-@SearchIndexable
 public class NotificationVibrationPreferenceFragment extends VibrationPreferenceFragment {
     @Override
     public int getMetricsCategory() {
@@ -62,7 +59,4 @@
         Vibrator vibrator = getContext().getSystemService(Vibrator.class);
         return vibrator.getDefaultNotificationVibrationIntensity();
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_notification_vibration_settings);
 }
diff --git a/src/com/android/settings/accessibility/PaletteListPreference.java b/src/com/android/settings/accessibility/PaletteListPreference.java
index c75da7f..de35112 100644
--- a/src/com/android/settings/accessibility/PaletteListPreference.java
+++ b/src/com/android/settings/accessibility/PaletteListPreference.java
@@ -31,6 +31,9 @@
 /** Preference that easier preview by matching name to color. */
 public class PaletteListPreference extends Preference {
 
+    private ListView mListView;
+    private ViewTreeObserver.OnPreDrawListener mPreDrawListener;
+
     /**
      * Constructs a new PaletteListPreference with the given context's theme and the supplied
      * attribute set.
@@ -58,6 +61,7 @@
     public PaletteListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setLayoutResource(R.layout.daltonizer_preview);
+        initPreDrawListener();
     }
 
     @Override
@@ -65,24 +69,39 @@
         super.onBindViewHolder(holder);
 
         final View rootView = holder.itemView;
-        final ListView listView = rootView.findViewById(R.id.palette_listView);
-        listView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        final int listViewHeight = listView.getMeasuredHeight();
-                        final int listViewWidth = listView.getMeasuredWidth();
-                        // Removes the callback after get result of measure view.
-                        listView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        mListView = rootView.findViewById(R.id.palette_listView);
+        if (mPreDrawListener != null) {
+            mListView.getViewTreeObserver().addOnPreDrawListener(mPreDrawListener);
+        }
+    }
 
-                        // Resets layout parameters to display whole items from listView.
-                        final FrameLayout.LayoutParams layoutParams =
-                                (FrameLayout.LayoutParams) listView.getLayoutParams();
-                        layoutParams.height = listViewHeight * listView.getAdapter().getCount();
-                        layoutParams.width = listViewWidth;
-                        listView.setLayoutParams(layoutParams);
-                        listView.invalidateViews();
-                    }
-                });
+    private void initPreDrawListener() {
+        mPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                if (mListView == null) {
+                    return false;
+                }
+
+                final int listViewHeight = mListView.getMeasuredHeight();
+                final int listViewWidth = mListView.getMeasuredWidth();
+
+                // Removes the callback after get result of measure view.
+                final ViewTreeObserver viewTreeObserver = mListView.getViewTreeObserver();
+                if (viewTreeObserver.isAlive()) {
+                    viewTreeObserver.removeOnPreDrawListener(this);
+                }
+                mPreDrawListener = null;
+
+                // 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);
+
+                return true;
+            }
+        };
     }
 }
diff --git a/src/com/android/settings/accessibility/RTTSettingPreferenceController.java b/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
new file mode 100644
index 0000000..3b5915d
--- /dev/null
+++ b/src/com/android/settings/accessibility/RTTSettingPreferenceController.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.accessibility;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+import android.telecom.TelecomManager;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
+/** A controller to control the status for RTT setting in Accessibility screen.*/
+public class RTTSettingPreferenceController extends BasePreferenceController {
+
+    private static final String DIALER_RTT_CONFIGURATION = "dialer_rtt_configuration";
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+    private final TelecomManager mTelecomManager;
+    private final CharSequence[] mModes;
+    private final String mDialerPackage;
+
+    @VisibleForTesting
+    Intent mRTTIntent;
+
+    public RTTSettingPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mContext = context;
+        mModes = mContext.getResources().getTextArray(R.array.rtt_setting_mode);
+        mDialerPackage = mContext.getString(R.string.config_rtt_setting_package_name);
+        mPackageManager = context.getPackageManager();
+        mTelecomManager = context.getSystemService(TelecomManager.class);
+        mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action));
+
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        final List<ResolveInfo> resolved =
+                mPackageManager.queryIntentActivities(mRTTIntent, 0 /* flags */);
+        return resolved != null && !resolved.isEmpty() && isDialerSupportRTTSetting()
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(getPreferenceKey());
+        pref.setIntent(mRTTIntent);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final int option = Settings.Secure.getInt(mContext.getContentResolver(),
+                DIALER_RTT_CONFIGURATION, 1 /* not visible */);
+        return mModes[option];
+    }
+
+    @VisibleForTesting
+    boolean isDialerSupportRTTSetting() {
+        return TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
+    }
+}
diff --git a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
index f1b8727..babfb9a 100644
--- a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
@@ -21,13 +21,10 @@
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
 /**
  * Fragment for picking accessibility shortcut service
  */
-@SearchIndexable
 public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment {
     @Override
     public int getMetricsCategory() {
@@ -66,7 +63,4 @@
         Vibrator vibrator = getContext().getSystemService(Vibrator.class);
         return vibrator.getDefaultRingVibrationIntensity();
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_ring_vibration_settings);
 }
diff --git a/src/com/android/settings/accessibility/SharedPreferenceUtils.java b/src/com/android/settings/accessibility/SharedPreferenceUtils.java
new file mode 100644
index 0000000..b25c3d2
--- /dev/null
+++ b/src/com/android/settings/accessibility/SharedPreferenceUtils.java
@@ -0,0 +1,49 @@
+/*
+ * 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.content.SharedPreferences;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.util.Set;
+
+/** Utility class for SharedPreferences. */
+public final class SharedPreferenceUtils {
+
+    private static final String ACCESSIBILITY_PERF = "accessibility_prefs";
+    private static final String USER_SHORTCUT_TYPE = "user_shortcut_type";
+    private SharedPreferenceUtils() { }
+
+    private static SharedPreferences getSharedPreferences(Context context, String fileName) {
+        return context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
+    }
+
+    /** Returns a set of user shortcuts list to determine user preferred service shortcut. */
+    public static Set<String> getUserShortcutType(Context context) {
+        return getSharedPreferences(context, ACCESSIBILITY_PERF)
+                .getStringSet(USER_SHORTCUT_TYPE, ImmutableSet.of());
+    }
+
+    /** Sets a set of user shortcuts list to determine user preferred service shortcut. */
+    public static void setUserShortcutType(Context context, Set<String> data) {
+        SharedPreferences.Editor editor = getSharedPreferences(context, ACCESSIBILITY_PERF).edit();
+        editor.remove(USER_SHORTCUT_TYPE).apply();
+        editor.putStringSet(USER_SHORTCUT_TYPE, data).apply();
+    }
+}
diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java
index b66a2b6..84ced68 100644
--- a/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -53,7 +53,10 @@
     }
     private OnClickListener mListener = null;
 
+    private static final float DISABLED_ALPHA = 0.5f;
+    private static final float ENABLED_ALPHA = 1.0f;
     private int mSettingsVisibility = View.VISIBLE;
+    private boolean mAutoEnabledSettings;
     private boolean mChecked = false;
 
     ShortcutPreference(Context context, AttributeSet attrs) {
@@ -65,24 +68,41 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        final CheckBox checkBox = holder.itemView.findViewById(R.id.checkbox);
         final LinearLayout mainFrame = holder.itemView.findViewById(R.id.main_frame);
-        if (mainFrame != null && checkBox != null) {
+        if (mainFrame != null) {
             mainFrame.setOnClickListener(view -> callOnCheckboxClicked());
+        }
+
+        final CheckBox checkBox = holder.itemView.findViewById(R.id.checkbox);
+        if (checkBox != null) {
             checkBox.setChecked(mChecked);
         }
 
+
         final View settings = holder.itemView.findViewById(android.R.id.widget_frame);
-        final View divider = holder.itemView.findViewById(R.id.divider);
-        if (settings != null && divider != null) {
+        if (settings != null) {
             settings.setOnClickListener(view -> callOnSettingsClicked());
+            settings.setEnabled(mAutoEnabledSettings ? mChecked : /* enabled */ true);
+
+            float alpha;
+            if (mAutoEnabledSettings) {
+                alpha = mChecked ? ENABLED_ALPHA : DISABLED_ALPHA;
+            } else {
+                alpha = ENABLED_ALPHA;
+            }
+
+            settings.setAlpha(alpha);
             settings.setVisibility(mSettingsVisibility);
+        }
+
+        final View divider = holder.itemView.findViewById(R.id.divider);
+        if (divider != null) {
             divider.setVisibility(mSettingsVisibility);
         }
     }
 
     /**
-     * Set the shortcut checkbox according to checked value.
+     * Sets the shortcut checkbox according to checked value.
      *
      * @param checked the state value of shortcut checkbox
      */
@@ -94,7 +114,7 @@
     }
 
     /**
-     * Get the checked value of shortcut checkbox.
+     * Gets the checked value of shortcut checkbox.
      *
      * @return the checked value of shortcut checkbox
      */
@@ -102,7 +122,22 @@
         return mChecked;
     }
 
-
+    /**
+     * Automatically/Manually enable settings according to checkbox click status.
+     *
+     * Automatically enable settings means settings view enabled when checkbox is clicked, and
+     * disabled when checkbox is not clicked.
+     * Manually enable settings means settings view always enabled.
+     *
+     * @param autoEnabled True will automatically enable settings, false will let settings view
+     *                    always enabled.
+     */
+    public void setAutoEnabledSettings(boolean autoEnabled) {
+        if (mAutoEnabledSettings != autoEnabled) {
+            mAutoEnabledSettings = autoEnabled;
+            notifyChanged();
+        }
+    }
 
     /**
      * Sets the visibility state of Settings view.
@@ -129,6 +164,7 @@
         setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
         setWidgetLayoutResource(R.layout.preference_widget_settings);
         setIconSpaceReserved(false);
+        mAutoEnabledSettings = true;
     }
 
     private void callOnSettingsClicked() {
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 93e6d92..82e8335 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -43,10 +43,8 @@
 import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.accessibility.AccessibilityUtils;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 import com.android.settingslib.widget.RadioButtonPreference;
 
@@ -57,7 +55,6 @@
 /**
  * Fragment for picking accessibility shortcut service
  */
-@SearchIndexable
 public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
 
     @Override
@@ -267,7 +264,4 @@
             return mServiceInfo.getComponentName().flattenToString();
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_shortcut_service_settings);
 }
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index bb24833..daba21c 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -35,11 +35,9 @@
 import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.CheckBox;
 
@@ -47,7 +45,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.PreferredShortcutType;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.widget.ToggleSwitch;
@@ -56,19 +54,22 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 /** Fragment for providing toggle bar and basic accessibility service setup. */
 public class ToggleAccessibilityServicePreferenceFragment extends
         ToggleFeaturePreferenceFragment implements ShortcutPreference.OnClickListener {
 
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
-    private static final String EXTRA_PREFERRED_SHORTCUT_TYPE = "preferred_shortcutType";
-    // TODO(b/142530063): Check the new setting key to decide which summary should be shown.
-    private static final String KEY_PREFERRED_SHORTCUT_TYPE = Settings.System.MASTER_MONO;
+    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
     private ShortcutPreference mShortcutPreference;
-    private int mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private int mUserShortcutType = UserShortcutType.DEFAULT;
+    // Used to restore the edit dialog status.
+    private int mUserShortcutTypeCache = UserShortcutType.DEFAULT;
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
 
@@ -114,15 +115,19 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        initShortcutPreference(savedInstanceState);
-        return super.onCreateView(inflater, container, savedInstanceState);
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
+            mUserShortcutTypeCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
+                    UserShortcutType.DEFAULT);
+        }
+        initShortcutPreference();
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_PREFERRED_SHORTCUT_TYPE, mPreferredShortcutType);
+        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypeCache);
         super.onSaveInstanceState(outState);
     }
 
@@ -131,6 +136,7 @@
         super.onResume();
         mSettingsContentObserver.register(getContentResolver());
         updateSwitchBarToggleSwitch();
+        updateShortcutPreferenceData();
         updateShortcutPreference();
     }
 
@@ -223,8 +229,8 @@
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mSoftwareTypeCheckBox, PreferredShortcutType.SOFTWARE);
-        updateCheckStatus(mHardwareTypeCheckBox, PreferredShortcutType.HARDWARE);
+        updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
+        updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
     }
 
     private void updateAlertDialogEnableState() {
@@ -238,48 +244,56 @@
         }
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @PreferredShortcutType int type) {
-        checkBox.setChecked((mPreferredShortcutType & type) == type);
+    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
+        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
         checkBox.setOnClickListener(v -> {
-            updatePreferredShortcutType(false);
+            updateUserShortcutType(/* saveChanges= */ false);
             updateAlertDialogEnableState();
         });
     }
 
-    private void updatePreferredShortcutType(boolean saveToDB) {
-        mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private void updateUserShortcutType(boolean saveChanges) {
+        mUserShortcutTypeCache = UserShortcutType.DEFAULT;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.SOFTWARE;
+            mUserShortcutTypeCache |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.HARDWARE;
+            mUserShortcutTypeCache |= UserShortcutType.HARDWARE;
         }
-        if (saveToDB) {
-            setPreferredShortcutType(mPreferredShortcutType);
+        if (saveChanges) {
+            mUserShortcutType = mUserShortcutTypeCache;
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
         }
     }
 
-    private void setSecureIntValue(String key, @PreferredShortcutType int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setPreferredShortcutType(@PreferredShortcutType int type) {
-        setSecureIntValue(KEY_PREFERRED_SHORTCUT_TYPE, type);
+    private void setUserShortcutType(Context context, int type) {
+        Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        final String componentName = getComponentName().flattenToString();
+        if (info.isEmpty()) {
+            info = new HashSet<>();
+        } else {
+            final Set<String> filtered = info.stream().filter(
+                    str -> str.contains(componentName)).collect(Collectors.toSet());
+            info.removeAll(filtered);
+        }
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                getComponentName().flattenToString(), type);
+        info.add(shortcut.flattenToString());
+        SharedPreferenceUtils.setUserShortcutType(context, info);
     }
 
     private String getShortcutTypeSummary(Context context) {
-        final int shortcutType = getPreferredShortcutType(context);
+        final int shortcutType = getUserShortcutType(context, UserShortcutType.SOFTWARE);
         final CharSequence softwareTitle =
                 context.getText(AccessibilityUtil.isGestureNavigateEnabled(context)
                 ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture
                 : R.string.accessibility_shortcut_edit_dialog_title_software);
 
         List<CharSequence> list = new ArrayList<>();
-        if ((shortcutType & PreferredShortcutType.SOFTWARE) == PreferredShortcutType.SOFTWARE) {
+        if ((shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             list.add(softwareTitle);
         }
-        if ((shortcutType & PreferredShortcutType.HARDWARE) == PreferredShortcutType.HARDWARE) {
+        if ((shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_edit_dialog_title_hardware);
             list.add(hardwareTitle);
@@ -293,22 +307,29 @@
         return AccessibilityUtil.capitalize(joinStrings);
     }
 
-    @PreferredShortcutType
-    private int getPreferredShortcutType(Context context) {
-        return getSecureIntValue(context, KEY_PREFERRED_SHORTCUT_TYPE,
-                PreferredShortcutType.SOFTWARE);
-    }
+    private int getUserShortcutType(Context context, @UserShortcutType int defaultValue) {
+        final Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        final String componentName = getComponentName().flattenToString();
+        final Set<String> filtered = info.stream().filter(
+                str -> str.contains(componentName)).collect(
+                Collectors.toSet());
+        if (filtered.isEmpty()) {
+            return defaultValue;
+        }
 
-    @PreferredShortcutType
-    private int getSecureIntValue(Context context, String key,
-            @PreferredShortcutType int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
+        final String str = (String) filtered.toArray()[0];
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
+        return shortcut.getUserShortcutType();
     }
 
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updatePreferredShortcutType(true);
+        updateUserShortcutType(/* saveChanges= */ true);
+        if (mShortcutPreference.getChecked()) {
+            AccessibilityUtil.optInAllValuesToSettings(getContext(), mUserShortcutType,
+                    mComponentName);
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), ~mUserShortcutType,
+                    mComponentName);
+        }
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
@@ -339,28 +360,28 @@
         switchBar.setSwitchBarText(switchBarText, switchBarText);
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the PreferredShortcut type
-        if (savedInstanceState != null) {
-            mPreferredShortcutType = savedInstanceState.getInt(EXTRA_PREFERRED_SHORTCUT_TYPE,
-                    PreferredShortcutType.DEFAULT);
+    private void updateShortcutPreferenceData() {
+        // Get the user shortcut type from settings provider.
+        mUserShortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
+                getComponentName());
+        if (mUserShortcutType != UserShortcutType.DEFAULT) {
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
+        } else {
+            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
+            mUserShortcutType = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         }
-        if (mPreferredShortcutType == PreferredShortcutType.DEFAULT) {
-            mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
-        }
+    }
 
-        // Initial ShortcutPreference widget
+    private void initShortcutPreference() {
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         mShortcutPreference = new ShortcutPreference(
                 preferenceScreen.getContext(), null);
         mShortcutPreference.setPersistent(false);
         mShortcutPreference.setKey(getShortcutPreferenceKey());
         mShortcutPreference.setTitle(R.string.accessibility_shortcut_title);
-        mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
         mShortcutPreference.setOnClickListener(this);
         // Put the shortcutPreference before settingsPreference.
         mShortcutPreference.setOrder(-1);
-        // TODO(b/142530063): Check the new key to decide whether checkbox should be checked.
         preferenceScreen.addPreference(mShortcutPreference);
     }
 
@@ -370,12 +391,11 @@
                 getShortcutPreferenceKey());
 
         if (shortcutPreference != null) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
+            final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
             shortcutPreference.setChecked(
-                    AccessibilityUtil.hasValueInSettings(getContext(),
-                            PreferredShortcutType.SOFTWARE,
+                    AccessibilityUtil.hasValuesInSettings(getContext(), shortcutTypes,
                             mComponentName));
+            shortcutPreference.setSummary(getShortcutTypeSummary(getContext()));
         }
     }
 
@@ -467,27 +487,25 @@
 
     @Override
     public void onCheckboxClicked(ShortcutPreference preference) {
+        final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
         if (preference.getChecked()) {
             if (!getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED)) {
                 preference.setChecked(false);
                 showPopupDialog(DialogType.ENABLE_WARNING_FROM_SHORTCUT);
             } else {
-                // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog
-                //  shortcut preferred key.
-                AccessibilityUtil.optInValueToSettings(getContext(), PreferredShortcutType.SOFTWARE,
+                AccessibilityUtil.optInAllValuesToSettings(getContext(), shortcutTypes,
                         mComponentName);
             }
         } else {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            AccessibilityUtil.optOutValueFromSettings(getContext(), PreferredShortcutType.SOFTWARE,
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), shortcutTypes,
                     mComponentName);
+            getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
         }
     }
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
+        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         showPopupDialog(DialogType.EDIT_SHORTCUT);
     }
 
@@ -558,7 +576,7 @@
         mDialog.dismiss();
     }
 
-    private void onDialogButtonFromShortcutClicked(View view) {
+    void onDialogButtonFromShortcutClicked(View view) {
         if (view.getId() == R.id.permission_enable_allow_button) {
             onAllowButtonFromShortcutClicked();
         } else if (view.getId() == R.id.permission_enable_deny_button) {
@@ -571,10 +589,9 @@
     private void onAllowButtonFromShortcutClicked() {
         final ShortcutPreference shortcutPreference = findPreference(getShortcutPreferenceKey());
         shortcutPreference.setChecked(true);
-        // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-        //  preferred key.
-        AccessibilityUtil.optInValueToSettings(getContext(), PreferredShortcutType.SOFTWARE,
-                mComponentName);
+
+        final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
+        AccessibilityUtil.optInAllValuesToSettings(getContext(), shortcutTypes, mComponentName);
 
         mDialog.dismiss();
     }
@@ -615,4 +632,8 @@
                             false));
         }
     }
+
+    ComponentName getComponentName() {
+        return mComponentName;
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
new file mode 100644
index 0000000..33ebfc5
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
@@ -0,0 +1,253 @@
+/*
+ * 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 android.content.Context.MODE_PRIVATE;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.util.ArrayMap;
+import android.view.accessibility.AccessibilityManager;
+
+import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.SeekBarPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
+
+import java.util.Map;
+
+/**
+ * Controller class that controls accessibility autoclick settings.
+ */
+public class ToggleAutoclickPreferenceController extends BasePreferenceController implements
+        LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin,
+        Preference.OnPreferenceChangeListener {
+    // Min allowed autoclick delay value.
+    static final int MIN_AUTOCLICK_DELAY_MS = 200;
+
+    // Max allowed autoclick delay value.
+    static final int MAX_AUTOCLICK_DELAY_MS = 1000;
+
+    private static final String CONTROL_AUTOCLICK_DELAY_SECURE =
+            Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY;
+    private static final String KEY_AUTOCLICK_DELA = "autoclick_delay";
+    private static final String KEY_CUSTOM_DELAY_VALUE = "custom_delay_value";
+    private static final String KEY_DELAY_MODE = "delay_mode";
+
+    // Allowed autoclick delay values are discrete.
+    // This is the difference between two allowed values.
+    private static final int AUTOCLICK_DELAY_STEP = 100;
+    private static final int AUTOCLICK_OFF_MODE = 0;
+    private static final int AUTOCLICK_CUSTOM_MODE = 2000;
+
+    // Pair the preference key and autoclick mode value.
+    private final Map<String, Integer> mAccessibilityAutoclickKeyToValueMap = new ArrayMap<>();
+
+    private SharedPreferences mSharedPreferences;
+    private final ContentResolver mContentResolver;
+    private final Resources mResources;
+    private OnChangeListener mOnChangeListener;
+    private RadioButtonPreference mDelayModePref;
+
+    /**
+     * Seek bar preference for autoclick delay value. The seek bar has values between 0 and
+     * number of possible discrete autoclick delay values. These will have to be converted to actual
+     * delay values before saving them in settings.
+     */
+    private SeekBarPreference mCustomDelayPref;
+    private int mCurrentUiAutoClickMode;
+
+    public ToggleAutoclickPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+
+        mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
+        mContentResolver = context.getContentResolver();
+        mResources = context.getResources();
+
+        setAutoclickModeToKeyMap();
+    }
+
+    public ToggleAutoclickPreferenceController(Context context, Lifecycle lifecycle,
+            String preferenceKey) {
+        super(context, preferenceKey);
+
+        mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
+        mContentResolver = context.getContentResolver();
+        mResources = context.getResources();
+
+        setAutoclickModeToKeyMap();
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    public void setOnChangeListener(OnChangeListener listener) {
+        mOnChangeListener = listener;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mDelayModePref = (RadioButtonPreference)
+                screen.findPreference(getPreferenceKey());
+        mDelayModePref.setOnClickListener(this);
+
+        int delay = getSharedPreferenceForDelayValue();
+
+        // Initialize seek bar preference. Sets seek bar size to the number of possible delay
+        // values.
+        mCustomDelayPref = (SeekBarPreference) screen.findPreference(KEY_AUTOCLICK_DELA);
+        mCustomDelayPref.setMax(delayToSeekBarProgress(MAX_AUTOCLICK_DELAY_MS));
+        mCustomDelayPref.setProgress(delayToSeekBarProgress(delay));
+        mCustomDelayPref.setOnPreferenceChangeListener(this);
+
+        updateState((Preference) mDelayModePref);
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference preference) {
+        int value = mAccessibilityAutoclickKeyToValueMap.get(mPreferenceKey);
+        handleRadioButtonPreferenceChange(value);
+        if (mOnChangeListener != null) {
+            mOnChangeListener.onCheckedChanged(mDelayModePref);
+        }
+    }
+
+    private void updatePreferenceCheckedState(int mode) {
+        if (mCurrentUiAutoClickMode == mode) {
+            mDelayModePref.setChecked(true);
+        }
+    }
+
+    private void updatePreferenceVisibleState(int mode) {
+        mCustomDelayPref.setVisible(mCurrentUiAutoClickMode == mode);
+    }
+
+    private void updateSeekBarProgressState() {
+        if (mCurrentUiAutoClickMode == AUTOCLICK_CUSTOM_MODE) {
+            int delay = getSharedPreferenceForDelayValue();
+            mCustomDelayPref.setProgress(delayToSeekBarProgress(delay));
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        mCurrentUiAutoClickMode = getSharedPreferenceForAutoClickMode();
+
+        // Reset RadioButton.
+        mDelayModePref.setChecked(false);
+        int mode = mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey());
+        updateSeekBarProgressState();
+        updatePreferenceCheckedState(mode);
+        updatePreferenceVisibleState(mode);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mCustomDelayPref && newValue instanceof Integer) {
+            putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, seekBarProgressToDelay((int) newValue));
+            mSharedPreferences.edit().putInt(KEY_CUSTOM_DELAY_VALUE,
+                    seekBarProgressToDelay((int) newValue)).apply();
+            return true;
+        }
+        return false;
+    }
+
+    /** Listener interface handles checked event. */
+    public interface OnChangeListener {
+        /**
+         * A hook that is called when preference checked.
+         */
+        void onCheckedChanged(Preference preference);
+    }
+
+    private void setAutoclickModeToKeyMap() {
+        String[] autoclickKeys = mResources.getStringArray(
+                R.array.accessibility_autoclick_control_selector_keys);
+
+        int[] autoclickValues = mResources.getIntArray(
+                R.array.accessibility_autoclick_selector_values);
+
+        final int autoclickValueCount = autoclickValues.length;
+        for (int i = 0; i < autoclickValueCount; i++) {
+            mAccessibilityAutoclickKeyToValueMap.put(autoclickKeys[i], autoclickValues[i]);
+        }
+    }
+
+    private void handleRadioButtonPreferenceChange(int preference) {
+        if (preference == AUTOCLICK_OFF_MODE) {
+            putSecureInt(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /*value= */ 0);
+        } else {
+            putSecureInt(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /*value= */ 1);
+        }
+
+        mSharedPreferences.edit().putInt(KEY_DELAY_MODE, preference).apply();
+
+        if (preference == AUTOCLICK_CUSTOM_MODE) {
+            putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, getSharedPreferenceForDelayValue());
+        } else {
+            putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, preference);
+        }
+    }
+
+    /** Converts seek bar preference progress value to autoclick delay associated with it. */
+    private int seekBarProgressToDelay(int progress) {
+        return progress * AUTOCLICK_DELAY_STEP + MIN_AUTOCLICK_DELAY_MS;
+    }
+
+    /**
+     * Converts autoclick delay value to seek bar preference progress values that represents said
+     * delay.
+     */
+    private int delayToSeekBarProgress(int delay) {
+        return (delay - MIN_AUTOCLICK_DELAY_MS) / AUTOCLICK_DELAY_STEP;
+    }
+
+    private void putSecureInt(String name, int value) {
+        Settings.Secure.putInt(mContentResolver, name, value);
+    }
+
+    private int getSharedPreferenceForDelayValue() {
+        int mode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_OFF_MODE);
+        int delay = mSharedPreferences.getInt(KEY_CUSTOM_DELAY_VALUE,
+                AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
+
+        return mode == AUTOCLICK_CUSTOM_MODE ? delay : mode;
+    }
+
+    private int getSharedPreferenceForAutoClickMode() {
+        return mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_OFF_MODE);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 45dd39e..0ba54eb 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -16,22 +16,20 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.MAX_AUTOCLICK_DELAY_MS;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.MIN_AUTOCLICK_DELAY_MS;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.view.accessibility.AccessibilityManager;
-import android.widget.Switch;
 
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
-import com.android.settings.widget.SeekBarPreference;
-import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -42,18 +40,11 @@
  * feature.
  */
 @SearchIndexable
-public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener, Preference.OnPreferenceChangeListener {
+public class ToggleAutoclickPreferenceFragment extends DashboardFragment
+        implements ToggleAutoclickPreferenceController.OnChangeListener {
 
-    /** Min allowed autoclick delay value. */
-    private static final int MIN_AUTOCLICK_DELAY = 200;
-    /** Max allowed autoclick delay value. */
-    private static final int MAX_AUTOCLICK_DELAY = 1000;
-    /**
-     * Allowed autoclick delay values are discrete. This is the difference between two allowed
-     * values.
-     */
-    private static final int AUTOCLICK_DELAY_STEP = 100;
+    private static final String TAG = "AutoclickPrefFragment";
+    private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
 
     /**
      * Resource ids from which autoclick preference summaries should be derived. The strings have
@@ -68,13 +59,6 @@
     };
 
     /**
-     * Seek bar preference for autoclick delay value. The seek bar has values between 0 and
-     * number of possible discrete autoclick delay values. These will have to be converted to actual
-     * delay values before saving them in settings.
-     */
-    private SeekBarPreference mDelay;
-
-    /**
      * Gets string that should be used as a autoclick preference summary for provided autoclick
      * delay.
      *
@@ -91,21 +75,15 @@
      * Finds index of the summary that should be used for the provided autoclick delay.
      */
     private static int getAutoclickPreferenceSummaryIndex(int delay) {
-        if (delay <= MIN_AUTOCLICK_DELAY) {
+        if (delay <= MIN_AUTOCLICK_DELAY_MS) {
             return 0;
         }
-        if (delay >= MAX_AUTOCLICK_DELAY) {
+        if (delay >= MAX_AUTOCLICK_DELAY_MS) {
             return mAutoclickPreferenceSummaries.length - 1;
         }
-        int rangeSize = (MAX_AUTOCLICK_DELAY - MIN_AUTOCLICK_DELAY) /
-                (mAutoclickPreferenceSummaries.length - 1);
-        return (delay - MIN_AUTOCLICK_DELAY) / rangeSize;
-    }
-
-    @Override
-    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
-        Settings.Secure.putInt(getContentResolver(), preferenceKey, enabled ? 1 : 0);
-        mDelay.setEnabled(enabled);
+        int delayRange = MAX_AUTOCLICK_DELAY_MS - MIN_AUTOCLICK_DELAY_MS;
+        int rangeSize = (delayRange) / (mAutoclickPreferenceSummaries.length - 1);
+        return (delay - MIN_AUTOCLICK_DELAY_MS) / rangeSize;
     }
 
     @Override
@@ -119,81 +97,67 @@
     }
 
     @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.accessibility_autoclick_settings;
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onResume() {
+        super.onResume();
 
-        int delay = Settings.Secure.getInt(
-                getContentResolver(), Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
-                AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
-
-        // Initialize seek bar preference. Sets seek bar size to the number of possible delay
-        // values.
-        mDelay = (SeekBarPreference) findPreference("autoclick_delay");
-        mDelay.setMax(delayToSeekBarProgress(MAX_AUTOCLICK_DELAY));
-        mDelay.setProgress(delayToSeekBarProgress(delay));
-        mDelay.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    protected void onInstallSwitchBarToggleSwitch() {
-        super.onInstallSwitchBarToggleSwitch();
-
-        int value = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0);
-        mSwitchBar.setCheckedInternal(value == 1);
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mDelay.setEnabled(value == 1);
-    }
-
-    @Override
-    protected void onRemoveSwitchBarToggleSwitch() {
-        super.onRemoveSwitchBarToggleSwitch();
-        mSwitchBar.removeOnSwitchChangeListener(this);
-    }
-
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        onPreferenceToggled(Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, isChecked);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mDelay && newValue instanceof Integer) {
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
-                    seekBarProgressToDelay((int) newValue));
-            return true;
+        for (AbstractPreferenceController controller : sControllers) {
+            ((ToggleAutoclickPreferenceController) controller).setOnChangeListener(this);
         }
-        return false;
     }
 
     @Override
-    protected void updateSwitchBarText(SwitchBar switchBar) {
-        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,
-                getString(R.string.accessibility_autoclick_preference_title));
-        switchBar.setSwitchBarText(switchBarText, switchBarText);
+    public void onPause() {
+        super.onPause();
+
+        for (AbstractPreferenceController controller : sControllers) {
+            ((ToggleAutoclickPreferenceController) controller).setOnChangeListener(null);
+        }
     }
 
-    /**
-     * Converts seek bar preference progress value to autoclick delay associated with it.
-     */
-    private int seekBarProgressToDelay(int progress) {
-        return progress * AUTOCLICK_DELAY_STEP + MIN_AUTOCLICK_DELAY;
+    @Override
+    public void onCheckedChanged(Preference preference) {
+        for (AbstractPreferenceController controller : sControllers) {
+            controller.updateState(preference);
+        }
     }
 
-    /**
-     * Converts autoclick delay value to seek bar preference progress values that represents said
-     * delay.
-     */
-    private int delayToSeekBarProgress(int delay) {
-        return (delay - MIN_AUTOCLICK_DELAY) / AUTOCLICK_DELAY_STEP;
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getSettingsLifecycle());
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        Resources resources = context.getResources();
+
+        String[] autoclickKeys = resources.getStringArray(
+                R.array.accessibility_autoclick_control_selector_keys);
+
+        final int length = autoclickKeys.length;
+        for (int i = 0; i < length; i++) {
+            sControllers.add(new ToggleAutoclickPreferenceController(
+                    context, lifecycle, autoclickKeys[i]));
+        }
+        return sControllers;
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_autoclick_settings);
+            new BaseSearchIndexProvider(R.xml.accessibility_autoclick_settings) {
+
+                @Override
+                public List<AbstractPreferenceController> createPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null);
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index c32248d..ca32239 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -39,14 +39,17 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.PreferredShortcutType;
 import com.android.settings.accessibility.AccessibilityUtil.State;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /** Settings page for color inversion. */
 @SearchIndexable
@@ -57,15 +60,13 @@
     private static final String PREVIEW_PREFERENCE_KEY = "color_inversion_preview";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     private static final int DIALOG_ID_EDIT_SHORTCUT = 1;
-    private static final String DISPLAY_INVERSION_ENABLED =
-            Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcutType";
-    // TODO(b/142530063): Check the new setting key to decide which summary should be shown.
-    private static final String KEY_SHORTCUT_TYPE = Settings.System.MASTER_MONO;
+    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
     private final Handler mHandler = new Handler();
     private ShortcutPreference mShortcutPreference;
     private SettingsContentObserver mSettingsContentObserver;
-    private int mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private int mUserShortcutType = UserShortcutType.DEFAULT;
+    // Used to restore the edit dialog status.
+    private int mUserShortcutTypeCache = UserShortcutType.DEFAULT;
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
 
@@ -126,9 +127,15 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        initShortcutPreference(savedInstanceState);
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
+            mUserShortcutTypeCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
+                    UserShortcutType.DEFAULT);
+        }
+        initShortcutPreference();
+
         final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
-        enableServiceFeatureKeys.add(DISPLAY_INVERSION_ENABLED);
+        enableServiceFeatureKeys.add(ENABLED);
         mSettingsContentObserver = new SettingsContentObserver(mHandler, enableServiceFeatureKeys) {
             @Override
             public void onChange(boolean selfChange, Uri uri) {
@@ -142,13 +149,14 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mPreferredShortcutType);
+        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypeCache);
         super.onSaveInstanceState(outState);
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        updateShortcutPreferenceData();
         updateShortcutPreference();
     }
 
@@ -176,8 +184,8 @@
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mSoftwareTypeCheckBox, PreferredShortcutType.SOFTWARE);
-        updateCheckStatus(mHardwareTypeCheckBox, PreferredShortcutType.HARDWARE);
+        updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
+        updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
     }
 
     private void updateAlertDialogEnableState() {
@@ -191,48 +199,56 @@
         }
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @PreferredShortcutType int type) {
-        checkBox.setChecked((mPreferredShortcutType & type) == type);
+    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
+        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
         checkBox.setOnClickListener(v -> {
-            updatePreferredShortcutType(false);
+            updateUserShortcutType(/* saveChanges= */ false);
             updateAlertDialogEnableState();
         });
     }
 
-    private void updatePreferredShortcutType(boolean saveToDB) {
-        mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private void updateUserShortcutType(boolean saveChanges) {
+        mUserShortcutTypeCache = UserShortcutType.DEFAULT;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.SOFTWARE;
+            mUserShortcutTypeCache |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.HARDWARE;
+            mUserShortcutTypeCache |= UserShortcutType.HARDWARE;
         }
-        if (saveToDB) {
-            setPreferredShortcutType(mPreferredShortcutType);
+        if (saveChanges) {
+            mUserShortcutType = mUserShortcutTypeCache;
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
         }
     }
 
-    private void setSecureIntValue(String key, @PreferredShortcutType int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setPreferredShortcutType(@PreferredShortcutType int type) {
-        setSecureIntValue(KEY_SHORTCUT_TYPE, type);
+    private void setUserShortcutType(Context context, int type) {
+        Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        if (info.isEmpty()) {
+            info = new HashSet<>();
+        } else {
+            final Set<String> filtered = info.stream().filter(
+                    str -> str.contains(getComponentName().flattenToString())).collect(
+                    Collectors.toSet());
+            info.removeAll(filtered);
+        }
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                getComponentName().flattenToString(), type);
+        info.add(shortcut.flattenToString());
+        SharedPreferenceUtils.setUserShortcutType(context, info);
     }
 
     private String getShortcutTypeSummary(Context context) {
-        final int shortcutType = getPreferredShortcutType(context);
+        final int shortcutType = getUserShortcutType(context, UserShortcutType.SOFTWARE);
         final CharSequence softwareTitle =
                 context.getText(AccessibilityUtil.isGestureNavigateEnabled(context)
                         ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture
                         : R.string.accessibility_shortcut_edit_dialog_title_software);
 
         List<CharSequence> list = new ArrayList<>();
-        if ((shortcutType & PreferredShortcutType.SOFTWARE) == PreferredShortcutType.SOFTWARE) {
+        if ((shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             list.add(softwareTitle);
         }
-        if ((shortcutType & PreferredShortcutType.HARDWARE) == PreferredShortcutType.HARDWARE) {
+        if ((shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_edit_dialog_title_hardware);
             list.add(hardwareTitle);
@@ -246,21 +262,29 @@
         return AccessibilityUtil.capitalize(joinStrings);
     }
 
-    @PreferredShortcutType
-    private int getPreferredShortcutType(Context context) {
-        return getSecureIntValue(context, KEY_SHORTCUT_TYPE, PreferredShortcutType.SOFTWARE);
-    }
+    private int getUserShortcutType(Context context, @UserShortcutType int defaultValue) {
+        final Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        final String componentName = getComponentName().flattenToString();
+        final Set<String> filtered = info.stream().filter(
+                str -> str.contains(componentName)).collect(
+                Collectors.toSet());
+        if (filtered.isEmpty()) {
+            return defaultValue;
+        }
 
-    @PreferredShortcutType
-    private int getSecureIntValue(Context context, String key,
-            @PreferredShortcutType int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
+        final String str = (String) filtered.toArray()[0];
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
+        return shortcut.getUserShortcutType();
     }
 
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updatePreferredShortcutType(true);
+        updateUserShortcutType(/* saveChanges= */ true);
+        if (mShortcutPreference.getChecked()) {
+            AccessibilityUtil.optInAllValuesToSettings(getContext(), mUserShortcutType,
+                    getComponentName());
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), ~mUserShortcutType,
+                    getComponentName());
+        }
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
@@ -273,17 +297,19 @@
         return 0;
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the PreferredShortcut type
-        if (savedInstanceState != null) {
-            mPreferredShortcutType = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    PreferredShortcutType.DEFAULT);
+    private void updateShortcutPreferenceData() {
+        // Get the user shortcut type from settings provider.
+        mUserShortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
+                getComponentName());
+        if (mUserShortcutType != UserShortcutType.DEFAULT) {
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
+        } else {
+            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
+            mUserShortcutType = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         }
-        if (mPreferredShortcutType == PreferredShortcutType.DEFAULT) {
-            mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
-        }
+    }
 
-        // Initial ShortcutPreference widget
+    private void initShortcutPreference() {
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         mShortcutPreference = new ShortcutPreference(
                 preferenceScreen.getContext(), null);
@@ -291,11 +317,9 @@
         mShortcutPreference.setPersistent(false);
         mShortcutPreference.setKey(getShortcutPreferenceKey());
         mShortcutPreference.setTitle(R.string.accessibility_shortcut_title);
-        mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
         mShortcutPreference.setOnClickListener(this);
         // Put the shortcutPreference before previewPreference.
         mShortcutPreference.setOrder(previewPreference.getOrder() - 1);
-        // TODO(b/142530063): Check the new key to decide whether checkbox should be checked.
         preferenceScreen.addPreference(mShortcutPreference);
     }
 
@@ -305,12 +329,11 @@
                 getShortcutPreferenceKey());
 
         if (shortcutPreference != null) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
+            final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
             shortcutPreference.setChecked(
-                    AccessibilityUtil.hasValueInSettings(getContext(),
-                            PreferredShortcutType.SOFTWARE,
+                    AccessibilityUtil.hasValuesInSettings(getContext(), shortcutTypes,
                             getComponentName()));
+            shortcutPreference.setSummary(getShortcutTypeSummary(getContext()));
         }
     }
 
@@ -324,22 +347,19 @@
 
     @Override
     public void onCheckboxClicked(ShortcutPreference preference) {
+        final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
         if (preference.getChecked()) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            AccessibilityUtil.optInValueToSettings(getContext(), PreferredShortcutType.SOFTWARE,
+            AccessibilityUtil.optInAllValuesToSettings(getContext(), shortcutTypes,
                     getComponentName());
         } else {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            AccessibilityUtil.optOutValueFromSettings(getContext(), PreferredShortcutType.SOFTWARE,
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), shortcutTypes,
                     getComponentName());
         }
     }
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
+        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         showDialog(DIALOG_ID_EDIT_SHORTCUT);
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 7a77b91..3016f6a 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -24,7 +24,9 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -38,8 +40,8 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.PreferredShortcutType;
 import com.android.settings.accessibility.AccessibilityUtil.State;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -48,7 +50,10 @@
 import com.android.settingslib.widget.RadioButtonPreference;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @SearchIndexable
 public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
@@ -57,14 +62,16 @@
 
     private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
     private static final String PREFERENCE_KEY = "daltonizer_mode_deuteranomaly";
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcutType";
-    // TODO(b/142530063): Check the new setting key to decide which summary should be shown.
-    private static final String KEY_SHORTCUT_TYPE = Settings.System.MASTER_MONO;
+    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     private static final int DIALOG_ID_EDIT_SHORTCUT = 1;
     private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
+    private final Handler mHandler = new Handler();
     private ShortcutPreference mShortcutPreference;
-    private int mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private SettingsContentObserver mSettingsContentObserver;
+    private int mUserShortcutType = UserShortcutType.DEFAULT;
+    // Used to restore the edit dialog status.
+    private int mUserShortcutTypeCache = UserShortcutType.DEFAULT;
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
 
@@ -93,13 +100,29 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        initShortcutPreference(savedInstanceState);
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
+            mUserShortcutTypeCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
+                    UserShortcutType.DEFAULT);
+        }
+        initShortcutPreference();
+
+        final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
+        enableServiceFeatureKeys.add(ENABLED);
+        mSettingsContentObserver = new SettingsContentObserver(mHandler, enableServiceFeatureKeys) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                mSwitchBar.setCheckedInternal(
+                        Settings.Secure.getInt(getContentResolver(), ENABLED, State.OFF)
+                                == State.ON);
+            }
+        };
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mPreferredShortcutType);
+        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypeCache);
         super.onSaveInstanceState(outState);
     }
 
@@ -112,6 +135,7 @@
             ((DaltonizerRadioButtonPreferenceController) controller).displayPreference(
                     getPreferenceScreen());
         }
+        updateShortcutPreferenceData();
         updateShortcutPreference();
     }
 
@@ -148,8 +172,8 @@
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mSoftwareTypeCheckBox, PreferredShortcutType.SOFTWARE);
-        updateCheckStatus(mHardwareTypeCheckBox, PreferredShortcutType.HARDWARE);
+        updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
+        updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
     }
 
     private void updateAlertDialogEnableState() {
@@ -163,48 +187,56 @@
         }
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @PreferredShortcutType int type) {
-        checkBox.setChecked((mPreferredShortcutType & type) == type);
+    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
+        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
         checkBox.setOnClickListener(v -> {
-            updatePreferredShortcutType(false);
+            updateUserShortcutType(/* saveChanges= */ false);
             updateAlertDialogEnableState();
         });
     }
 
-    private void updatePreferredShortcutType(boolean saveToDB) {
-        mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private void updateUserShortcutType(boolean saveChanges) {
+        mUserShortcutTypeCache = UserShortcutType.DEFAULT;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.SOFTWARE;
+            mUserShortcutTypeCache |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.HARDWARE;
+            mUserShortcutTypeCache |= UserShortcutType.HARDWARE;
         }
-        if (saveToDB) {
-            setPreferredShortcutType(mPreferredShortcutType);
+        if (saveChanges) {
+            mUserShortcutType = mUserShortcutTypeCache;
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
         }
     }
 
-    private void setSecureIntValue(String key, @PreferredShortcutType int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setPreferredShortcutType(@PreferredShortcutType int type) {
-        setSecureIntValue(KEY_SHORTCUT_TYPE, type);
+    private void setUserShortcutType(Context context, int type) {
+        Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        if (info.isEmpty()) {
+            info = new HashSet<>();
+        } else {
+            final Set<String> filtered = info.stream().filter(
+                    str -> str.contains(getComponentName().flattenToString())).collect(
+                    Collectors.toSet());
+            info.removeAll(filtered);
+        }
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                getComponentName().flattenToString(), type);
+        info.add(shortcut.flattenToString());
+        SharedPreferenceUtils.setUserShortcutType(context, info);
     }
 
     private String getShortcutTypeSummary(Context context) {
-        final int shortcutType = getPreferredShortcutType(context);
+        final int shortcutType = getUserShortcutType(context, UserShortcutType.SOFTWARE);
         final CharSequence softwareTitle =
                 context.getText(AccessibilityUtil.isGestureNavigateEnabled(context)
                         ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture
                         : R.string.accessibility_shortcut_edit_dialog_title_software);
 
         List<CharSequence> list = new ArrayList<>();
-        if ((shortcutType & PreferredShortcutType.SOFTWARE) == PreferredShortcutType.SOFTWARE) {
+        if ((shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             list.add(softwareTitle);
         }
-        if ((shortcutType & PreferredShortcutType.HARDWARE) == PreferredShortcutType.HARDWARE) {
+        if ((shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_edit_dialog_title_hardware);
             list.add(hardwareTitle);
@@ -218,26 +250,46 @@
         return AccessibilityUtil.capitalize(joinStrings);
     }
 
-    @PreferredShortcutType
-    private int getPreferredShortcutType(Context context) {
-        return getSecureIntValue(context, KEY_SHORTCUT_TYPE, PreferredShortcutType.SOFTWARE);
-    }
+    private int getUserShortcutType(Context context, @UserShortcutType int defaultValue) {
+        final Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        final String componentName = getComponentName().flattenToString();
+        final Set<String> filtered = info.stream().filter(
+                str -> str.contains(componentName)).collect(
+                Collectors.toSet());
+        if (filtered.isEmpty()) {
+            return defaultValue;
+        }
 
-    @PreferredShortcutType
-    private int getSecureIntValue(Context context, String key,
-            @PreferredShortcutType int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
+        final String str = (String) filtered.toArray()[0];
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
+        return shortcut.getUserShortcutType();
     }
 
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updatePreferredShortcutType(true);
+        updateUserShortcutType(/* saveChanges= */ true);
+        if (mShortcutPreference.getChecked()) {
+            AccessibilityUtil.optInAllValuesToSettings(getContext(), mUserShortcutType,
+                    getComponentName());
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), ~mUserShortcutType,
+                    getComponentName());
+        }
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        mSettingsContentObserver.register(getContentResolver());
+    }
+
+    @Override
+    public void onStop() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onStop();
+    }
+
+    @Override
     public int getMetricsCategory() {
         return SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER;
     }
@@ -293,36 +345,23 @@
 
     @Override
     public void onCheckboxClicked(ShortcutPreference preference) {
+        final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
         if (preference.getChecked()) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            AccessibilityUtil.optInValueToSettings(getContext(), PreferredShortcutType.SOFTWARE,
+            AccessibilityUtil.optInAllValuesToSettings(getContext(), shortcutTypes,
                     getComponentName());
         } else {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            AccessibilityUtil.optOutValueFromSettings(getContext(), PreferredShortcutType.SOFTWARE,
+            AccessibilityUtil.optOutAllValuesFromSettings(getContext(), shortcutTypes,
                     getComponentName());
         }
     }
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
+        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         showDialog(DIALOG_ID_EDIT_SHORTCUT);
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the PreferredShortcut type
-        if (savedInstanceState != null) {
-            mPreferredShortcutType = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    PreferredShortcutType.DEFAULT);
-        }
-        if (mPreferredShortcutType == PreferredShortcutType.DEFAULT) {
-            mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
-        }
-
-        // Initial ShortcutPreference widget
+    private void initShortcutPreference() {
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         mShortcutPreference = new ShortcutPreference(
                 preferenceScreen.getContext(), null);
@@ -334,22 +373,32 @@
         final RadioButtonPreference radioButtonPreference = findPreference(PREFERENCE_KEY);
         // Put the shortcutPreference before radioButtonPreference.
         mShortcutPreference.setOrder(radioButtonPreference.getOrder() - 1);
-        // TODO(b/142530063): Check the new key to decide whether checkbox should be checked.
         preferenceScreen.addPreference(mShortcutPreference);
     }
 
+    private void updateShortcutPreferenceData() {
+        // Get the user shortcut type from settings provider.
+        mUserShortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
+                getComponentName());
+        if (mUserShortcutType != UserShortcutType.DEFAULT) {
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
+        } else {
+            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
+            mUserShortcutType = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
+        }
+    }
+
     private void updateShortcutPreference() {
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         final ShortcutPreference shortcutPreference = preferenceScreen.findPreference(
                 getShortcutPreferenceKey());
 
         if (shortcutPreference != null) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
+            final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
             shortcutPreference.setChecked(
-                    AccessibilityUtil.hasValueInSettings(getContext(),
-                            PreferredShortcutType.SOFTWARE,
+                    AccessibilityUtil.hasValuesInSettings(getContext(), shortcutTypes,
                             getComponentName()));
+            shortcutPreference.setSummary(getShortcutTypeSummary(getContext()));
         }
 
     }
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 094b909..fe2449c 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -24,6 +24,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -38,6 +39,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.StringJoiner;
 
 public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment {
 
@@ -117,6 +119,7 @@
         if (mStaticDescription != null) {
             final StaticTextPreference staticTextPreference = new StaticTextPreference(
                     preferenceScreen.getContext());
+            staticTextPreference.setSelectable(/* selectable= */ false);
             staticTextPreference.setSummary(mStaticDescription);
             preferenceScreen.addPreference(staticTextPreference);
         }
@@ -128,6 +131,7 @@
 
             final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(
                     preferenceScreen.getContext());
+            htmlTextPreference.setSelectable(/* selectable= */ false);
             htmlTextPreference.setSummary(mHtmlDescription);
             htmlTextPreference.setImageGetter(mImageGetter);
             htmlTextPreference.setUnsupportedTagList(unsupportedTagList);
@@ -227,4 +231,49 @@
         mImageGetterCacheView.setImageDrawable(null);
         return drawable;
     }
+
+    static final class AccessibilityUserShortcutType {
+        private static final char COMPONENT_NAME_SEPARATOR = ':';
+        private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
+                new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
+
+        private String mComponentName;
+        private int mUserShortcutType;
+
+        AccessibilityUserShortcutType(String componentName, int userShortcutType) {
+            this.mComponentName = componentName;
+            this.mUserShortcutType = userShortcutType;
+        }
+
+        AccessibilityUserShortcutType(String flattenedString) {
+            sStringColonSplitter.setString(flattenedString);
+            if (sStringColonSplitter.hasNext()) {
+                this.mComponentName = sStringColonSplitter.next();
+                this.mUserShortcutType = Integer.parseInt(sStringColonSplitter.next());
+            }
+        }
+
+        String getComponentName() {
+            return mComponentName;
+        }
+
+        void setComponentName(String componentName) {
+            this.mComponentName = componentName;
+        }
+
+        int getUserShortcutType() {
+            return mUserShortcutType;
+        }
+
+        void setUserShortcutType(int userShortcutType) {
+            this.mUserShortcutType = userShortcutType;
+        }
+
+        String flattenToString() {
+            final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
+            joiner.add(mComponentName);
+            joiner.add(String.valueOf(mUserShortcutType));
+            return joiner.toString();
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index bfc2360..3060ddb 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -17,6 +17,8 @@
 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;
@@ -46,28 +48,32 @@
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.PreferredShortcutType;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 public class ToggleScreenMagnificationPreferenceFragment extends
         ToggleFeaturePreferenceFragment implements ShortcutPreference.OnClickListener {
 
     private static final String SETTINGS_KEY = "screen_magnification_settings";
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcutType";
-    // TODO(b/142530063): Check the new setting key to decide which summary should be shown.
-    private static final String KEY_SHORTCUT_TYPE = Settings.System.MASTER_MONO;
+    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     private ShortcutPreference mShortcutPreference;
-    private int mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private int mUserShortcutType = UserShortcutType.DEFAULT;
+    // Used to restore the edit dialog status.
+    private int mUserShortcutTypeCache = UserShortcutType.DEFAULT;
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
     private CheckBox mTripleTapTypeCheckBox;
-    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
 
     // TODO(b/147021230): Will move common functions and variables to
     //  android/internal/accessibility folder. For now, magnification need to be treated
@@ -172,7 +178,12 @@
         final PreferenceCategory optionCategory = new PreferenceCategory(getPrefContext());
         optionCategory.setTitle(R.string.accessibility_screen_option);
 
-        initShortcutPreference(savedInstanceState);
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
+            mUserShortcutTypeCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
+                    UserShortcutType.DEFAULT);
+        }
+        initShortcutPreference();
 
         final Preference settingsPreference = new Preference(getPrefContext());
         settingsPreference.setTitle(R.string.accessibility_magnification_service_settings_title);
@@ -206,7 +217,7 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mPreferredShortcutType);
+        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypeCache);
         super.onSaveInstanceState(outState);
     }
 
@@ -220,6 +231,7 @@
         }
 
         updateConfigurationWarningIfNeeded();
+        updateShortcutPreferenceData();
         updateShortcutPreference();
     }
 
@@ -255,6 +267,11 @@
         updateAlertDialogCheckState();
         updateAlertDialogEnableState();
 
+        // 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);
@@ -263,9 +280,9 @@
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mSoftwareTypeCheckBox, PreferredShortcutType.SOFTWARE);
-        updateCheckStatus(mHardwareTypeCheckBox, PreferredShortcutType.HARDWARE);
-        updateCheckStatus(mTripleTapTypeCheckBox, PreferredShortcutType.TRIPLETAP);
+        updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
+        updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
+        updateCheckStatus(mTripleTapTypeCheckBox, UserShortcutType.TRIPLETAP);
     }
 
     private void updateAlertDialogEnableState() {
@@ -282,57 +299,65 @@
         }
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @PreferredShortcutType int type) {
-        checkBox.setChecked((mPreferredShortcutType & type) == type);
+    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
+        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
         checkBox.setOnClickListener(v -> {
-            updatePreferredShortcutType(false);
+            updateUserShortcutType(/* saveChanges= */ false);
             updateAlertDialogEnableState();
         });
     }
 
-    private void updatePreferredShortcutType(boolean saveToDB) {
-        mPreferredShortcutType = PreferredShortcutType.DEFAULT;
+    private void updateUserShortcutType(boolean saveChanges) {
+        mUserShortcutTypeCache = UserShortcutType.DEFAULT;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.SOFTWARE;
+            mUserShortcutTypeCache |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.HARDWARE;
+            mUserShortcutTypeCache |= UserShortcutType.HARDWARE;
         }
         if (mTripleTapTypeCheckBox.isChecked()) {
-            mPreferredShortcutType |= PreferredShortcutType.TRIPLETAP;
+            mUserShortcutTypeCache |= UserShortcutType.TRIPLETAP;
         }
-        if (saveToDB) {
-            setPreferredShortcutType(mPreferredShortcutType);
+        if (saveChanges) {
+            mUserShortcutType = mUserShortcutTypeCache;
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
         }
     }
 
-    private void setSecureIntValue(String key, @PreferredShortcutType int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setPreferredShortcutType(@PreferredShortcutType int type) {
-        setSecureIntValue(KEY_SHORTCUT_TYPE, type);
+    private void setUserShortcutType(Context context, int type) {
+        Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        if (info.isEmpty()) {
+            info = new HashSet<>();
+        } else {
+            final Set<String> filtered = info.stream().filter(
+                    str -> str.contains(getComponentName())).collect(
+                    Collectors.toSet());
+            info.removeAll(filtered);
+        }
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                getComponentName(), type);
+        info.add(shortcut.flattenToString());
+        SharedPreferenceUtils.setUserShortcutType(context, info);
     }
 
     private String getShortcutTypeSummary(Context context) {
-        final int shortcutType = getPreferredShortcutType(context);
+        final int shortcutType = getUserShortcutType(context, UserShortcutType.DEFAULT);
         final CharSequence softwareTitle =
                 context.getText(AccessibilityUtil.isGestureNavigateEnabled(context)
                         ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture
                         : R.string.accessibility_shortcut_edit_dialog_title_software);
 
         List<CharSequence> list = new ArrayList<>();
-        if ((shortcutType & PreferredShortcutType.SOFTWARE) == PreferredShortcutType.SOFTWARE) {
+        if ((shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             list.add(softwareTitle);
         }
-        if ((shortcutType & PreferredShortcutType.HARDWARE) == PreferredShortcutType.HARDWARE) {
+        if ((shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_edit_dialog_title_hardware);
             list.add(hardwareTitle);
         }
 
-        if ((shortcutType & PreferredShortcutType.TRIPLETAP) == PreferredShortcutType.TRIPLETAP) {
+        if ((shortcutType & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP) {
             final CharSequence tripleTapTitle = context.getText(
                     R.string.accessibility_shortcut_edit_dialog_title_triple_tap);
             list.add(tripleTapTitle);
@@ -346,25 +371,34 @@
         return AccessibilityUtil.capitalize(joinStrings);
     }
 
-    @PreferredShortcutType
-    private int getPreferredShortcutType(Context context) {
-        return getSecureIntValue(context, KEY_SHORTCUT_TYPE, PreferredShortcutType.SOFTWARE);
-    }
+    private int getUserShortcutType(Context context, @UserShortcutType int defaultValue) {
+        final Set<String> info = SharedPreferenceUtils.getUserShortcutType(context);
+        final Set<String> filtered = info.stream().filter(
+                str -> str.contains(getComponentName())).collect(
+                Collectors.toSet());
+        if (filtered.isEmpty()) {
+            return defaultValue;
+        }
 
-    @PreferredShortcutType
-    private int getSecureIntValue(Context context, String key,
-            @PreferredShortcutType int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
+        final String str = (String) filtered.toArray()[0];
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
+        return shortcut.getUserShortcutType();
     }
 
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updatePreferredShortcutType(true);
+        updateUserShortcutType(/* saveChanges= */ true);
+        if (mShortcutPreference.getChecked()) {
+            optInAllMagnificationValuesToSettings(getContext(), mUserShortcutType);
+            optOutAllMagnificationValuesFromSettings(getContext(), ~mUserShortcutType);
+        }
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
 
+    private String getComponentName() {
+        return MAGNIFICATION_CONTROLLER_NAME;
+    }
+
     @Override
     public int getMetricsCategory() {
         // TODO: Distinguish between magnification modes
@@ -422,58 +456,32 @@
 
     @Override
     public void onCheckboxClicked(ShortcutPreference preference) {
+        final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
         if (preference.getChecked()) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            optInMagnificationValueToSettings(getContext(), PreferredShortcutType.SOFTWARE);
-
-            // TODO(b/142531156): ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED need to be treated
-            //  as special case in this file.
-            if ((mPreferredShortcutType & PreferredShortcutType.SOFTWARE)
-                    == PreferredShortcutType.SOFTWARE) {
-                MagnificationPreferenceFragment.setChecked(getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,
-                        /* isChecked= */ true);
-            }
-            if ((mPreferredShortcutType & PreferredShortcutType.TRIPLETAP)
-                    == PreferredShortcutType.TRIPLETAP) {
-                MagnificationPreferenceFragment.setChecked(getContentResolver(),
-                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
-                        /* isChecked= */ true);
-            }
+            optInAllMagnificationValuesToSettings(getContext(), shortcutTypes);
         } else {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
-            optOutMagnificationValueFromSettings(getContext(), PreferredShortcutType.SOFTWARE);
-
-            // TODO(b/142531156): ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED need to be treated
-            //  as special case in this file.
-            MagnificationPreferenceFragment.setChecked(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,
-                    /* isChecked= */ false);
-            MagnificationPreferenceFragment.setChecked(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
-                    /* isChecked= */ false);
+            optOutAllMagnificationValuesFromSettings(getContext(), shortcutTypes);
         }
     }
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
+        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         showDialog(DialogType.EDIT_SHORTCUT);
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the PreferredShortcut type
-        if (savedInstanceState != null) {
-            mPreferredShortcutType = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    PreferredShortcutType.DEFAULT);
+    private void updateShortcutPreferenceData() {
+        // Get the user shortcut type from settings provider.
+        mUserShortcutType = getUserShortcutTypeFromSettings(getPrefContext());
+        if (mUserShortcutType != UserShortcutType.DEFAULT) {
+            setUserShortcutType(getPrefContext(), mUserShortcutType);
+        } else {
+            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
+            mUserShortcutType = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);
         }
-        if (mPreferredShortcutType == PreferredShortcutType.DEFAULT) {
-            mPreferredShortcutType = getPreferredShortcutType(getPrefContext());
-        }
+    }
 
-        // Initial ShortcutPreference widget
+    private void initShortcutPreference() {
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         mShortcutPreference = new ShortcutPreference(
                 preferenceScreen.getContext(), null);
@@ -482,7 +490,6 @@
         mShortcutPreference.setTitle(R.string.accessibility_magnification_shortcut_title);
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
         mShortcutPreference.setOnClickListener(this);
-        // TODO(b/142530063): Check the new setting key to decide which summary should be shown.
     }
 
     private void updateShortcutPreference() {
@@ -491,11 +498,10 @@
                 getShortcutPreferenceKey());
 
         if (shortcutPreference != null) {
-            // TODO(b/142531156): Replace PreferredShortcutType.SOFTWARE value with dialog shortcut
-            //  preferred key.
+            final int shortcutTypes = getUserShortcutType(getContext(), UserShortcutType.SOFTWARE);
             shortcutPreference.setChecked(
-                    hasMagnificationValueInSettings(getContext(),
-                            PreferredShortcutType.SOFTWARE));
+                    hasMagnificationValuesInSettings(getContext(), shortcutTypes));
+            shortcutPreference.setSummary(getShortcutTypeSummary(getContext()));
         }
     }
 
@@ -520,13 +526,24 @@
         int EDIT_SHORTCUT = 3;
     }
 
-    private static void optInMagnificationValueToSettings(Context context,
-            @PreferredShortcutType int shortcutType) {
-        final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
-        final String targetString = Settings.Secure.getString(context.getContentResolver(),
-                targetKey);
+    @VisibleForTesting
+    static void optInAllMagnificationValuesToSettings(Context context, int shortcutTypes) {
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            optInMagnificationValueToSettings(context, UserShortcutType.SOFTWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            optInMagnificationValueToSettings(context, UserShortcutType.HARDWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
+            optInMagnificationValueToSettings(context, UserShortcutType.TRIPLETAP);
+        }
+    }
 
-        if (TextUtils.isEmpty(targetString)) {
+    private static void optInMagnificationValueToSettings(Context context,
+            @UserShortcutType int shortcutType) {
+        if (shortcutType == UserShortcutType.TRIPLETAP) {
+            Settings.Secure.putInt(context.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
             return;
         }
 
@@ -534,17 +551,41 @@
             return;
         }
 
+        final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
+        final String targetString = Settings.Secure.getString(context.getContentResolver(),
+                targetKey);
         final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
 
-        joiner.add(Settings.Secure.getString(context.getContentResolver(), targetKey));
+        if (!TextUtils.isEmpty(targetString)) {
+            joiner.add(targetString);
+        }
         joiner.add(MAGNIFICATION_CONTROLLER_NAME);
 
         Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
     }
 
+    @VisibleForTesting
+    static void optOutAllMagnificationValuesFromSettings(Context context,
+            int shortcutTypes) {
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            optOutMagnificationValueFromSettings(context, UserShortcutType.SOFTWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            optOutMagnificationValueFromSettings(context, UserShortcutType.HARDWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
+            optOutMagnificationValueFromSettings(context, UserShortcutType.TRIPLETAP);
+        }
+    }
+
     private static void optOutMagnificationValueFromSettings(Context context,
-            @PreferredShortcutType int shortcutType) {
-        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
+            @UserShortcutType int shortcutType) {
+        if (shortcutType == UserShortcutType.TRIPLETAP) {
+            Settings.Secure.putInt(context.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
+            return;
+        }
+
         final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
                 targetKey);
@@ -553,6 +594,8 @@
             return;
         }
 
+        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
+
         sStringColonSplitter.setString(targetString);
         while (sStringColonSplitter.hasNext()) {
             final String name = sStringColonSplitter.next();
@@ -565,8 +608,29 @@
         Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
     }
 
+    @VisibleForTesting
+    static boolean hasMagnificationValuesInSettings(Context context, int shortcutTypes) {
+        boolean exist = false;
+
+        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+            exist = hasMagnificationValueInSettings(context, UserShortcutType.SOFTWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
+            exist |= hasMagnificationValueInSettings(context, UserShortcutType.HARDWARE);
+        }
+        if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
+            exist |= hasMagnificationValueInSettings(context, UserShortcutType.TRIPLETAP);
+        }
+        return exist;
+    }
+
     private static boolean hasMagnificationValueInSettings(Context context,
-            @PreferredShortcutType int shortcutType) {
+            @UserShortcutType int shortcutType) {
+        if (shortcutType == UserShortcutType.TRIPLETAP) {
+            return Settings.Secure.getInt(context.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
+        }
+
         final String targetKey = AccessibilityUtil.convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
                 targetKey);
@@ -584,4 +648,27 @@
         }
         return false;
     }
+
+    private boolean isWindowMagnification(Context context) {
+        final int mode = Settings.Secure.getIntForUser(
+                context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
+                context.getContentResolver().getUserId());
+        return mode == Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
+    }
+
+    private static int getUserShortcutTypeFromSettings(Context context) {
+        int shortcutTypes = UserShortcutType.DEFAULT;
+        if (hasMagnificationValuesInSettings(context, UserShortcutType.SOFTWARE)) {
+            shortcutTypes |= UserShortcutType.SOFTWARE;
+        }
+        if (hasMagnificationValuesInSettings(context, UserShortcutType.HARDWARE)) {
+            shortcutTypes |= UserShortcutType.HARDWARE;
+        }
+        if (hasMagnificationValuesInSettings(context, UserShortcutType.TRIPLETAP)) {
+            shortcutTypes |= UserShortcutType.TRIPLETAP;
+        }
+        return shortcutTypes;
+    }
 }
diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
index 701830f..f6bbbf3 100644
--- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
@@ -21,13 +21,10 @@
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
 /**
  * Fragment for picking accessibility shortcut service
  */
-@SearchIndexable
 public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragment {
     @Override
     public int getMetricsCategory() {
@@ -62,7 +59,4 @@
     protected int getPreviewVibrationAudioAttributesUsage() {
         return AudioAttributes.USAGE_ASSISTANCE_SONIFICATION;
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.accessibility_touch_vibration_settings);
 }
diff --git a/src/com/android/settings/applications/AppStateSmsPremBridge.java b/src/com/android/settings/applications/AppStateSmsPremBridge.java
index 5a79a62..1db0428 100644
--- a/src/com/android/settings/applications/AppStateSmsPremBridge.java
+++ b/src/com/android/settings/applications/AppStateSmsPremBridge.java
@@ -14,11 +14,8 @@
 package com.android.settings.applications;
 
 import android.content.Context;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.telephony.SmsManager;
 
-import com.android.internal.telephony.ISms;
-import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -31,12 +28,12 @@
 public class AppStateSmsPremBridge extends AppStateBaseBridge {
 
     private final Context mContext;
-    private final ISms mSmsManager;
+    private final SmsManager mSmsManager;
 
     public AppStateSmsPremBridge(Context context, ApplicationsState appState, Callback callback) {
         super(appState, callback);
         mContext = context;
-        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
+        mSmsManager = SmsManager.getDefault();
     }
 
     @Override
@@ -61,25 +58,18 @@
     }
 
     private int getSmsState(String pkg) {
-        try {
-            return mSmsManager.getPremiumSmsPermission(pkg);
-        } catch (RemoteException e) {
-            return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
-        }
+        return mSmsManager.getPremiumSmsConsent(pkg);
     }
 
     public void setSmsState(String pkg, int state) {
-        try {
-            mSmsManager.setPremiumSmsPermission(pkg, state);
-        } catch (RemoteException e) {
-        }
+        mSmsManager.setPremiumSmsConsent(pkg, state);
     }
 
     public static class SmsState {
         public int smsState;
 
         public boolean isGranted() {
-            return smsState == SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW;
+            return smsState == SmsManager.PREMIUM_SMS_CONSENT_ALWAYS_ALLOW;
         }
     }
 
@@ -91,7 +81,7 @@
         @Override
         public boolean filterApp(AppEntry info) {
             return info.extraInfo instanceof SmsState && ((SmsState) info.extraInfo).smsState
-                    != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+                    != SmsManager.PREMIUM_SMS_CONSENT_UNKNOWN;
         }
     };
 }
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index c647b8d..ac8146a 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -16,24 +16,30 @@
 
 package com.android.settings.applications;
 
+import android.Manifest;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
 import android.content.pm.UserInfo;
 import android.location.LocationManager;
 import android.os.RemoteException;
 import android.os.UserManager;
+import android.service.euicc.EuiccService;
 import android.telecom.DefaultDialerManager;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.telephony.SmsApplication;
-import com.android.internal.telephony.euicc.EuiccConnector;
 import com.android.settings.R;
 
 import java.util.ArrayList;
@@ -41,12 +47,17 @@
 import java.util.Set;
 
 public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvider {
+    private static final String TAG = "AppFeatureProviderImpl";
 
     protected final Context mContext;
     private final PackageManager mPm;
     private final IPackageManager mPms;
     private final DevicePolicyManager mDpm;
     private final UserManager mUm;
+    /** Flags to use when querying PackageManager for Euicc component implementations. */
+    private static final int EUICC_QUERY_FLAGS =
+            PackageManager.MATCH_SYSTEM_ONLY | PackageManager.MATCH_DEBUG_TRIAGED_MISSING
+                | PackageManager.GET_RESOLVED_FILTER;
 
     public ApplicationFeatureProviderImpl(Context context, PackageManager pm,
             IPackageManager pms, DevicePolicyManager dpm) {
@@ -143,7 +154,7 @@
         }
 
         // Keep Euicc Service enabled.
-        final ComponentInfo euicc = EuiccConnector.findBestComponent(mPm);
+        final ComponentInfo euicc = findEuiccService(mPm);
         if (euicc != null) {
             keepEnabledPackages.add(euicc.packageName);
         }
@@ -239,4 +250,89 @@
             mCallback.onListOfAppsResult(list);
         }
     }
+
+    /**
+     * Return the component info of the EuiccService to bind to, or null if none were found.
+     */
+    @VisibleForTesting
+    ComponentInfo findEuiccService(PackageManager packageManager) {
+        final Intent intent = new Intent(EuiccService.EUICC_SERVICE_INTERFACE);
+        final List<ResolveInfo> resolveInfoList =
+                packageManager.queryIntentServices(intent, EUICC_QUERY_FLAGS);
+        final ComponentInfo bestComponent = findEuiccService(packageManager, resolveInfoList);
+        if (bestComponent == null) {
+            Log.w(TAG, "No valid EuiccService implementation found");
+        }
+        return bestComponent;
+    }
+
+    private ComponentInfo findEuiccService(
+            PackageManager packageManager, List<ResolveInfo> resolveInfoList) {
+        int bestPriority = Integer.MIN_VALUE;
+        ComponentInfo bestComponent = null;
+        if (resolveInfoList != null) {
+            for (ResolveInfo resolveInfo : resolveInfoList) {
+                if (!isValidEuiccComponent(packageManager, resolveInfo)) {
+                    continue;
+                }
+
+                if (resolveInfo.filter.getPriority() > bestPriority) {
+                    bestPriority = resolveInfo.filter.getPriority();
+                    bestComponent = getComponentInfo(resolveInfo);
+                }
+            }
+        }
+
+        return bestComponent;
+    }
+
+    private boolean isValidEuiccComponent(
+            PackageManager packageManager, ResolveInfo resolveInfo) {
+        final ComponentInfo componentInfo = getComponentInfo(resolveInfo);
+        final String packageName = componentInfo.packageName;
+
+        // Verify that the app is privileged (via granting of a privileged permission).
+        if (packageManager.checkPermission(
+                Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS, packageName)
+                != PackageManager.PERMISSION_GRANTED) {
+            Log.e(TAG, "Package " + packageName
+                    + " does not declare WRITE_EMBEDDED_SUBSCRIPTIONS");
+            return false;
+        }
+
+        // Verify that only the system can access the component.
+        final String permission;
+        if (componentInfo instanceof ServiceInfo) {
+            permission = ((ServiceInfo) componentInfo).permission;
+        } else if (componentInfo instanceof ActivityInfo) {
+            permission = ((ActivityInfo) componentInfo).permission;
+        } else {
+            throw new IllegalArgumentException("Can only verify services/activities");
+        }
+        if (!TextUtils.equals(permission, Manifest.permission.BIND_EUICC_SERVICE)) {
+            Log.e(TAG, "Package " + packageName
+                    + " does not require the BIND_EUICC_SERVICE permission");
+            return false;
+        }
+
+        // Verify that the component declares a priority.
+        if (resolveInfo.filter == null || resolveInfo.filter.getPriority() == 0) {
+            Log.e(TAG, "Package " + packageName + " does not specify a priority");
+            return false;
+        }
+        return true;
+    }
+
+    private ComponentInfo getComponentInfo(ResolveInfo resolveInfo) {
+        if (resolveInfo.activityInfo != null) {
+            return resolveInfo.activityInfo;
+        }
+        if (resolveInfo.serviceInfo != null) {
+            return resolveInfo.serviceInfo;
+        }
+        if (resolveInfo.providerInfo != null) {
+            return resolveInfo.providerInfo;
+        }
+        throw new IllegalStateException("Missing ComponentInfo!");
+    }
 }
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index e188996..a9f4ade 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -29,13 +29,7 @@
 import com.android.settings.Utils;
 import com.android.settings.applications.ProcStatsData.MemInfo;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
-/**
- * Settings screen to provide memory stats summary
- */
-@SearchIndexable
 public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
 
     private static final String KEY_STATUS_HEADER = "status_header";
@@ -131,7 +125,4 @@
         }
         return false;
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.process_stats_summary);
 }
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
index 3a9bf0a..e5953db 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
@@ -27,17 +27,11 @@
 import com.android.internal.app.AssistUtils;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.applications.DefaultAppInfo;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Fragment for picking assistant voice input
- */
-@SearchIndexable
 public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
 
     private VoiceInputHelper mHelper;
@@ -172,7 +166,4 @@
             return new Intent(Intent.ACTION_MAIN).setComponent(mInfo.settings);
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.default_voice_settings);
 }
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index 3e88d9c..c96f43f 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -37,6 +37,7 @@
 public class ManageAssist extends DashboardFragment {
 
     private static final String TAG = "ManageAssist";
+    private static final String KEY_ASSIST = "gesture_assist_application";
 
     @Override
     protected String getLogTag() {
@@ -84,5 +85,12 @@
                         Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(KEY_ASSIST);
+                    return keys;
+                }
             };
 }
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index d38893f..2597665 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -88,10 +88,10 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.AppStateManageExternalStorageBridge;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateBaseBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
+import com.android.settings.applications.AppStateManageExternalStorageBridge;
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState;
 import com.android.settings.applications.AppStateOverlayBridge;
@@ -101,10 +101,10 @@
 import com.android.settings.applications.AppStateWriteSettingsBridge;
 import com.android.settings.applications.AppStorageSettings;
 import com.android.settings.applications.UsageAccessDetails;
-import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
+import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
@@ -181,10 +181,10 @@
     private static final int NO_USER_SPECIFIED = -1;
 
     /**
-     * Intents with action {@link android.provider.Settings#ACTION_MANAGE_APP_OVERLAY_PERMISSION}
-     * and data URI scheme "package" don't go to the app-specific screen for managing the permission
-     * anymore. Instead, they redirect to this screen for managing all the apps that have requested
-     * such permission.
+     * Intents with action {@code android.settings.MANAGE_APP_OVERLAY_PERMISSION}
+     * and data URI scheme {@code package} don't go to the app-specific screen for managing the
+     * permission anymore. Instead, they redirect to this screen for managing all the apps that have
+     * requested such permission.
      */
     @ChangeId
     private static final long CHANGE_RESTRICT_SAW_INTENT = 135920175L;
@@ -262,6 +262,7 @@
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
         final Activity activity = getActivity();
+        mUserManager = activity.getSystemService(UserManager.class);
         mApplicationsState = ApplicationsState.getInstance(activity.getApplication());
 
         Intent intent = activity.getIntent();
@@ -321,7 +322,6 @@
             mListType = LIST_TYPE_NOTIFICATION;
             mUsageStatsManager = IUsageStatsManager.Stub.asInterface(
                     ServiceManager.getService(Context.USAGE_STATS_SERVICE));
-            mUserManager = UserManager.get(getContext());
             mNotificationBackend = new NotificationBackend();
             mSortOrder = R.id.sort_order_recent_notification;
             screenTitle = R.string.app_notifications_title;
@@ -337,7 +337,11 @@
                 == ProfileSelectFragment.ProfileType.PERSONAL : false;
         mIsWorkOnly = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
                 == ProfileSelectFragment.ProfileType.WORK : false;
-        mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : NO_USER_SPECIFIED;
+        mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : UserHandle.myUserId();
+        if (mIsWorkOnly && mWorkUserId == UserHandle.myUserId()) {
+            mWorkUserId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
+        }
+
         mExpandSearch = activity.getIntent().getBooleanExtra(EXTRA_EXPAND_SEARCH_VIEW, false);
 
         if (savedInstanceState != null) {
diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
index 53c778c..184fd1d 100644
--- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
@@ -84,7 +84,7 @@
                 DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
                 DocumentsContract.Root.MIME_TYPE_ITEM);
         intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.putExtra(Intent.EXTRA_USER_ID, mUser);
+        intent.putExtra(Intent.EXTRA_USER_ID, mUser.getIdentifier());
         Utils.launchIntent(fragment, intent);
     }
 }
diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
index c7a1a1c..30166c9 100644
--- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
@@ -83,6 +83,7 @@
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
         intent.setType(IMAGE_MIME_TYPE);
         intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
+        intent.putExtra(Intent.EXTRA_USER_ID, mUser.getIdentifier());
         Utils.launchIntent(fragment, intent);
     }
 }
diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
index 7e4553d..f1c578e 100644
--- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
@@ -21,6 +21,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.telephony.SmsManager;
 import android.view.View;
 
 import androidx.annotation.VisibleForTesting;
@@ -30,7 +31,6 @@
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 
-import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateBaseBridge.Callback;
 import com.android.settings.applications.AppStateSmsPremBridge;
@@ -110,20 +110,20 @@
 
     @VisibleForTesting
     void logSpecialPermissionChange(int smsState, String packageName) {
-        int category = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+        int category = SmsManager.PREMIUM_SMS_CONSENT_UNKNOWN;
         switch (smsState) {
-            case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER:
+            case SmsManager.PREMIUM_SMS_CONSENT_ASK_USER:
                 category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK;
                 break;
-            case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW:
+            case SmsManager.PREMIUM_SMS_CONSENT_NEVER_ALLOW:
                 category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY;
                 break;
-            case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW:
+            case SmsManager.PREMIUM_SMS_CONSENT_ALWAYS_ALLOW:
                 category = SettingsEnums.
                         APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW;
                 break;
         }
-        if (category != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+        if (category != SmsManager.PREMIUM_SMS_CONSENT_UNKNOWN) {
             // TODO(117860032): Category is wrong. It should be defined in SettingsEnums.
             final MetricsFeatureProvider metricsFeatureProvider =
                     FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
@@ -220,9 +220,9 @@
             }
             setEntries(R.array.security_settings_premium_sms_values);
             setEntryValues(new CharSequence[]{
-                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER),
-                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW),
-                    String.valueOf(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW),
+                    String.valueOf(SmsManager.PREMIUM_SMS_CONSENT_ASK_USER),
+                    String.valueOf(SmsManager.PREMIUM_SMS_CONSENT_NEVER_ALLOW),
+                    String.valueOf(SmsManager.PREMIUM_SMS_CONSENT_ALWAYS_ALLOW),
             });
             setValue(String.valueOf(getCurrentValue()));
             setSummary("%s");
@@ -231,7 +231,7 @@
         private int getCurrentValue() {
             return mAppEntry.extraInfo instanceof SmsState
                     ? ((SmsState) mAppEntry.extraInfo).smsState
-                    : SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+                    : SmsManager.PREMIUM_SMS_CONSENT_UNKNOWN;
         }
 
         @Override
diff --git a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
index 17a933b..f131e35 100644
--- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
@@ -60,6 +60,8 @@
 
     @Override
     protected void onStop() {
+        super.onStop();
+
         if (mSidecar != null) {
             mSidecar.setListener(null);
         }
@@ -78,6 +80,12 @@
     }
 
     @Override
+    protected boolean shouldFinishWhenBackgrounded() {
+        // Prevent super.onStop() from finishing, since we handle this in our onStop().
+        return false;
+    }
+
+    @Override
     public void onBackPressed() {
         if (mSidecar != null) {
             mSidecar.setListener(null);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 8194878..3831b07 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -217,13 +217,15 @@
 
     private void stopIconAnimation() {
         mAnimationCancelled = true;
-        mIconAnimationDrawable.stop();
+        if (mIconAnimationDrawable != null) {
+            mIconAnimationDrawable.stop();
+        }
     }
 
     @Override
     protected void onStop() {
-        stopIconAnimation();
         super.onStop();
+        stopIconAnimation();
     }
 
     private void animateProgress(int progress) {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 9508268..dbedb4a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -115,10 +115,10 @@
 
     @Override
     protected void onStop() {
+        super.onStop();
         if (mAnimation != null) {
             mAnimation.pauseAnimation();
         }
-        super.onStop();
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index a7fae14..c807893 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -79,7 +79,7 @@
                         .setButton2Text(R.string.bluetooth_device_context_connect)
                         .setButton2Icon(R.drawable.ic_add_24dp)
                         .setButton2OnClickListener(
-                                view -> mCachedDevice.connect(true /* connectAllProfiles */));
+                                view -> mCachedDevice.connect());
                 mConnectButtonInitialized = true;
             }
         }
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index a8b1c97..4226720 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -241,7 +241,7 @@
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
             metricsFeatureProvider.action(context,
                     SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);
-            mCachedDevice.connect(true);
+            mCachedDevice.connect();
         } else if (bondState == BluetoothDevice.BOND_NONE) {
             metricsFeatureProvider.action(context,
                     SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index f220b8b..2e0e9b5 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -29,17 +29,14 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.FooterPreference;
 
 /**
  * BluetoothPairingDetail is a page to scan bluetooth devices and pair them.
  */
-@SearchIndexable
 public class BluetoothPairingDetail extends DeviceListPreferenceFragment implements
         Indexable {
     private static final String TAG = "BluetoothPairingDetail";
@@ -236,7 +233,4 @@
         Toast.makeText(getContext(), R.string.connected_device_bluetooth_turned_on_toast,
                 Toast.LENGTH_SHORT).show();
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.bluetooth_pairing_detail);
 }
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index 8d91dfc..fdd7a1e 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -57,7 +57,7 @@
         mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
         final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
                 .getBluetoothDevice();
-        device.connect(true);
+        device.connect();
         return true;
     }
 
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
index 5839e3c..b813f1d 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
@@ -35,10 +35,8 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
@@ -47,7 +45,6 @@
 /**
  * Picker for BugReportHandler.
  */
-@SearchIndexable
 public class BugReportHandlerPicker extends DefaultAppPickerFragment {
     private static final String TAG = "BugReportHandlerPicker";
 
@@ -214,7 +211,4 @@
             return super.loadLabel();
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.bug_report_handler_settings);
 }
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 2d6a098..12e978f 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -30,9 +30,7 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.RadioButtonPreference;
@@ -44,7 +42,6 @@
 /**
  * Provides options for selecting the default USB mode.
  */
-@SearchIndexable
 public class UsbDefaultFragment extends RadioButtonPickerFragment {
     @VisibleForTesting
     UsbBackend mUsbBackend;
@@ -195,7 +192,4 @@
             }
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.usb_default_fragment);
 }
\ No newline at end of file
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index 4f20a01..3321c05 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -26,7 +26,6 @@
     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 PERSONAL_WORK_PROFILE = "settings_work_profile";
     public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
     public static final String CONDITIONAL_CARDS = "settings_conditionals";
 }
diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java
index 35f7ebb..240426d 100644
--- a/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -89,7 +89,6 @@
         int FLAG_NEED_PREF_APPEND = 1 << 10;
         int FLAG_UNAVAILABLE_SLICE_SUBTITLE = 1 << 11;
         int FLAG_FOR_WORK = 1 << 12;
-        int FLAG_NEED_FRAGMENT = 1 << 13;
     }
 
     public static final String METADATA_PREF_TYPE = "type";
@@ -103,7 +102,6 @@
     public static final String METADATA_APPEND = "staticPreferenceLocation";
     public static final String METADATA_UNAVAILABLE_SLICE_SUBTITLE = "unavailable_slice_subtitle";
     public static final String METADATA_FOR_WORK = "for_work";
-    public static final String METADATA_FRAGMENT = "fragment";
 
     private static final String ENTRIES_SEPARATOR = "|";
 
@@ -252,10 +250,6 @@
                 preferenceMetadata.putBoolean(METADATA_FOR_WORK,
                         isForWork(preferenceAttributes));
             }
-            if (hasFlag(flags, MetadataFlag.FLAG_NEED_FRAGMENT)) {
-                preferenceMetadata.putString(METADATA_FRAGMENT,
-                        getFragment(preferenceAttributes));
-            }
             metadata.add(preferenceMetadata);
 
             preferenceAttributes.recycle();
@@ -346,9 +340,4 @@
         return styledAttributes.getBoolean(
                 R.styleable.Preference_forWork, false);
     }
-
-    private static String getFragment(TypedArray styledAttributes) {
-        return styledAttributes.getString(
-                com.android.internal.R.styleable.Preference_fragment);
-    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 1e97bdb..5ad8bb2 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -39,6 +39,7 @@
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
+import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
@@ -256,6 +257,7 @@
             DrawOverlayDetails.class.getName(),
             WriteSettingsDetails.class.getName(),
             ExternalSourcesDetails.class.getName(),
+            ManageExternalStorageDetails.class.getName(),
             WallpaperTypeSettings.class.getName(),
             VrListenerSettings.class.getName(),
             PictureInPictureSettings.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index f5cbf18..f719494 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -31,6 +31,7 @@
 import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.fuelgauge.SmartBatterySettings;
 import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
 import com.android.settings.gestures.GestureSettings;
 import com.android.settings.homepage.TopLevelSettings;
@@ -116,6 +117,8 @@
                 CategoryKey.CATEGORY_MY_DEVICE_INFO);
         PARENT_TO_CATEGORY_KEY_MAP.put(BatterySaverSettings.class.getName(),
                 CategoryKey.CATEGORY_BATTERY_SAVER_SETTINGS);
+        PARENT_TO_CATEGORY_KEY_MAP.put(SmartBatterySettings.class.getName(),
+                CategoryKey.CATEGORY_SMART_BATTERY_SETTINGS);
 
         CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
 
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index d0187b9..594e553 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -45,6 +46,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Locale;
 
 /**
  * Base fragment class for profile settings.
@@ -93,6 +95,9 @@
      * Used in fragment argument with Extra key {@link SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB}
      */
     public static final int WORK_TAB = 1;
+    private static final int[] LABEL = {
+            R.string.category_personal, R.string.category_work
+    };
 
     private ViewGroup mContentView;
 
@@ -101,7 +106,7 @@
             Bundle savedInstanceState) {
         mContentView = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
         final Activity activity = getActivity();
-        final int selectedTab = getTabId(activity, getArguments());
+        final int selectedTab = convertPosition(getTabId(activity, getArguments()));
 
         final View tabContainer = mContentView.findViewById(R.id.tab_container);
         final ViewPager viewPager = tabContainer.findViewById(R.id.view_pager);
@@ -180,7 +185,7 @@
 
         @Override
         public Fragment getItem(int position) {
-            return mChildFragments[position];
+            return mChildFragments[convertPosition(position)];
         }
 
         @Override
@@ -190,11 +195,15 @@
 
         @Override
         public CharSequence getPageTitle(int position) {
-            if (position == 0) {
-                return mContext.getString(R.string.category_personal);
-            } else {
-                return mContext.getString(R.string.category_work);
-            }
+            return mContext.getString(LABEL[convertPosition(position)]);
         }
     }
+
+    private static int convertPosition(int index) {
+        if (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault())
+                == View.LAYOUT_DIRECTION_RTL) {
+            return LABEL.length - 1 - index;
+        }
+        return index;
+    }
 }
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index ef3e7b6..0308cf7 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -159,11 +159,12 @@
      * SubscriptionManager#INVALID_SUBSCRIPTION_ID
      */
     public static int getDefaultSubscriptionId(Context context) {
-        SubscriptionManager subManager = SubscriptionManager.from(context);
+        SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
         if (subManager == null) {
             return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
         }
-        SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();
+        SubscriptionInfo subscriptionInfo =
+                subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());
         if (subscriptionInfo == null) {
             List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();
             if (list.size() == 0) {
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index c04b51c..0de9f67 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -163,7 +163,7 @@
 
     /** For Search. */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.automatic_storage_management_settings) {
+            new BaseSearchIndexProvider() {
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
                     return false;
diff --git a/src/com/android/settings/development/BluetoothA2dpConfigStore.java b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
index edf74e3..0b154d2 100644
--- a/src/com/android/settings/development/BluetoothA2dpConfigStore.java
+++ b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
@@ -54,7 +54,7 @@
         mChannelMode = channelMode;
     }
 
-    public void setCodecSpecific1Value(int codecSpecific1Value) {
+    public void setCodecSpecific1Value(long codecSpecific1Value) {
         mCodecSpecific1Value = codecSpecific1Value;
     }
 
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index 99f25d8..71907b6 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -53,9 +53,12 @@
     protected static final int[] CHANNEL_MODES = {BluetoothCodecConfig.CHANNEL_MODE_STEREO,
             BluetoothCodecConfig.CHANNEL_MODE_MONO};
 
+    protected final BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
     public AbstractBluetoothDialogPreferenceController(Context context, Lifecycle lifecycle,
                                                        BluetoothA2dpConfigStore store) {
         super(context, lifecycle, store);
+        mBluetoothA2dpConfigStore = store;
     }
 
     @Override
@@ -92,6 +95,25 @@
         return getCurrentIndexByConfig(codecConfig);
     }
 
+    @Override
+    public void onBluetoothServiceConnected(BluetoothA2dp bluetoothA2dp) {
+        super.onBluetoothServiceConnected(bluetoothA2dp);
+        initConfigStore();
+    }
+
+    private void initConfigStore() {
+        final BluetoothCodecConfig config = getCurrentCodecConfig();
+        if (config == null) {
+            return;
+        }
+        mBluetoothA2dpConfigStore.setCodecType(config.getCodecType());
+        mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
+        mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
+        mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
+        mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority());
+        mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
+    }
+
     /**
      * Updates the new value to the {@link BluetoothA2dpConfigStore}.
      *
@@ -174,7 +196,7 @@
      *
      * @param enabled Is {@code true} when the setting is enabled.
      */
-    public void onHDAudioEnabled(boolean enabled) {};
+    public void onHDAudioEnabled(boolean enabled) {}
 
     static int getHighestCodec(BluetoothCodecConfig[] configs) {
         if (configs == null) {
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
index c018bf7..8abe162 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
@@ -33,13 +33,11 @@
         DeveloperOptionsPreferenceController implements BluetoothServiceConnectionListener,
         LifecycleObserver, OnDestroy {
 
-    protected final BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
     protected volatile BluetoothA2dp mBluetoothA2dp;
 
     public AbstractBluetoothPreferenceController(Context context, Lifecycle lifecycle,
                                                  BluetoothA2dpConfigStore store) {
         super(context);
-        mBluetoothA2dpConfigStore = store;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
diff --git a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
index 4ac389b..4b38e11 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
@@ -57,7 +57,7 @@
 
     @Override
     protected void writeConfigurationValues(final int index) {
-        int codecSpecific1Value = 0; // default
+        long codecSpecific1Value = 0; // default
         switch (index) {
             case 0:
             case 1:
diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index ffa5c29..db90500 100644
--- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.development.compat;
 
-import static com.android.settings.development.AppPicker.EXTRA_DEBUGGABLE;
-import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_COMPAT_CHANGE_APP;
 import static com.android.internal.compat.OverrideAllowedState.ALLOWED;
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_COMPAT_CHANGE_APP;
 
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
@@ -27,9 +26,7 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -45,13 +42,9 @@
 import com.android.internal.compat.CompatibilityChangeConfig;
 import com.android.internal.compat.CompatibilityChangeInfo;
 import com.android.internal.compat.IPlatformCompat;
-import com.android.internal.compat.IOverrideValidator;
-import com.android.internal.compat.OverrideAllowedState;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.development.AppPicker;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +55,6 @@
 /**
  * Dashboard for Platform Compat preferences.
  */
-@SearchIndexable
 public class PlatformCompatDashboard extends DashboardFragment {
     private static final String TAG = "PlatformCompatDashboard";
     private static final String COMPAT_APP = "compat_app";
@@ -299,7 +291,4 @@
             return true;
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.platform_compat_settings);
 }
diff --git a/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java b/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java
deleted file mode 100644
index 07bd4a6..0000000
--- a/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java
+++ /dev/null
@@ -1,36 +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.deviceinfo;
-
-import android.content.Context;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.deviceinfo.AbstractImsStatusPreferenceController;
-
-/**
- * Concrete subclass of IMS status preference controller
- */
-public class ImsStatusPreferenceController extends AbstractImsStatusPreferenceController
-        implements PreferenceControllerMixin {
-    public ImsStatusPreferenceController(Context context,
-            Lifecycle lifecycle) {
-        super(context, lifecycle);
-    }
-
-    // This space intentionally left blank
-}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 5c3772b..2ee77d9 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -31,7 +31,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.R;
 
 public class ImeiInfoDialogController {
@@ -147,8 +146,7 @@
 
     @VisibleForTesting
     boolean isCdmaLteEnabled() {
-        return mTelephonyManager.getLteOnCdmaMode(mSubscriptionInfo.getSubscriptionId())
-                == PhoneConstants.LTE_ON_CDMA_TRUE;
+        return mTelephonyManager.isGlobalModeEnabled();
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java b/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
index 150dfff..f74b68f 100644
--- a/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
+++ b/src/com/android/settings/deviceinfo/legal/ModuleLicensesDashboard.java
@@ -20,13 +20,7 @@
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 
-/**
- * Settings screen for mainline module licenses
- */
-@SearchIndexable
 public class ModuleLicensesDashboard extends DashboardFragment {
     private static final String TAG = "ModuleLicensesDashboard";
 
@@ -49,7 +43,4 @@
     public int getHelpResource() {
         return 0;
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.module_licenses);
 }
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 26d8e2b..8096c0b 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -43,7 +43,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.R;
 import com.android.settingslib.DeviceInfoUtils;
 import com.android.settingslib.Utils;
@@ -94,6 +93,9 @@
     @VisibleForTesting
     final static int IMS_REGISTRATION_STATE_VALUE_ID = R.id.ims_reg_state_value;
 
+    @VisibleForTesting
+    static final int MAX_PHONE_COUNT_SINGLE_SIM = 1;
+
     private final static String CB_AREA_INFO_RECEIVED_ACTION =
             "com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
     private final static String GET_LATEST_CB_AREA_INFO_ACTION =
@@ -411,7 +413,7 @@
         boolean shouldHaveEid = false;
         String eid = null;
 
-        if (mTelephonyManager.getPhoneCount() > PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM) {
+        if (mTelephonyManager.getActiveModemCount() > MAX_PHONE_COUNT_SINGLE_SIM) {
             // Get EID per-SIM in multi-SIM mode
             Map<Integer, Integer> mapping = mTelephonyManager.getLogicalToPhysicalSlotMapping();
             int pSlotId = mapping.getOrDefault(mSlotIndex,
diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
index 6e471e4..5d58547 100644
--- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
+++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
@@ -20,7 +20,6 @@
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.UserManager;
-import android.util.FeatureFlagUtils;
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
@@ -30,7 +29,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.Utils;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -70,10 +68,6 @@
             Context context, UserManager userManager) {
 
         List<AbstractPreferenceController> controllers = new ArrayList<>();
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlags.PERSONAL_WORK_PROFILE)) {
-            controllers.add(new NoSecondaryUserController(context));
-            return controllers;
-        }
         UserInfo primaryUser = userManager.getPrimaryUser();
         boolean addedUser = false;
         List<UserInfo> infos = userManager.getUsers();
@@ -84,8 +78,6 @@
             }
 
             if (info == null || Utils.isProfileOf(primaryUser, info)) {
-                controllers.add(
-                        new UserProfileController(context, info, USER_PROFILE_INSERTION_LOCATION));
                 continue;
             }
 
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 1f58ea9..f87ff33 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -28,8 +28,8 @@
 import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.storage.VolumeInfo;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -41,11 +41,10 @@
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.overlay.FeatureFactory;
@@ -256,25 +255,15 @@
     public void onLoadFinished(SparseArray<StorageAsyncLoader.AppsStorageResult> result,
             int userId) {
         final StorageAsyncLoader.AppsStorageResult data = result.get(userId);
+        final StorageAsyncLoader.AppsStorageResult profileData = result.get(
+                Utils.getManagedProfileId(mContext.getSystemService(UserManager.class), userId));
 
-        // TODO(b/35927909): Figure out how to split out apps which are only installed for work
-        //       profiles in order to attribute those app's code bytes only to that profile.
-        mPhotoPreference.setStorageSize(
-                data.photosAppsSize + data.externalStats.imageBytes + data.externalStats.videoBytes,
-                mTotalSize);
-        mAudioPreference.setStorageSize(
-                data.musicAppsSize + data.externalStats.audioBytes, mTotalSize);
-        mGamePreference.setStorageSize(data.gamesSize, mTotalSize);
-        mMoviesPreference.setStorageSize(data.videoAppsSize, mTotalSize);
-        mAppPreference.setStorageSize(data.otherAppsSize, mTotalSize);
-
-        long otherExternalBytes =
-                data.externalStats.totalBytes
-                        - data.externalStats.audioBytes
-                        - data.externalStats.videoBytes
-                        - data.externalStats.imageBytes
-                        - data.externalStats.appBytes;
-        mFilePreference.setStorageSize(otherExternalBytes, mTotalSize);
+        mPhotoPreference.setStorageSize(getPhotosSize(data, profileData), mTotalSize);
+        mAudioPreference.setStorageSize(getAudioSize(data, profileData), mTotalSize);
+        mGamePreference.setStorageSize(getGamesSize(data, profileData), mTotalSize);
+        mMoviesPreference.setStorageSize(getMoviesSize(data, profileData), mTotalSize);
+        mAppPreference.setStorageSize(getAppsSize(data, profileData), mTotalSize);
+        mFilePreference.setStorageSize(getFilesSize(data, profileData), mTotalSize);
 
         if (mSystemPreference != null) {
             // Everything else that hasn't already been attributed is tracked as
@@ -335,6 +324,19 @@
                 .toIntent();
     }
 
+    private long getPhotosSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.photosAppsSize + data.externalStats.imageBytes
+                    + data.externalStats.videoBytes
+                    + profileData.photosAppsSize + profileData.externalStats.imageBytes
+                    + profileData.externalStats.videoBytes;
+        } else {
+            return data.photosAppsSize + data.externalStats.imageBytes
+                    + data.externalStats.videoBytes;
+        }
+    }
+
     private Intent getAudioIntent() {
         if (mVolume == null) {
             return null;
@@ -354,6 +356,16 @@
                 .toIntent();
     }
 
+    private long getAudioSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.musicAppsSize + data.externalStats.audioBytes
+                    + profileData.musicAppsSize + profileData.externalStats.audioBytes;
+        } else {
+            return data.musicAppsSize + data.externalStats.audioBytes;
+        }
+    }
+
     private Intent getAppsIntent() {
         if (mVolume == null) {
             return null;
@@ -371,6 +383,15 @@
                 .toIntent();
     }
 
+    private long getAppsSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.otherAppsSize + profileData.otherAppsSize;
+        } else {
+            return data.otherAppsSize;
+        }
+    }
+
     private Intent getGamesIntent() {
         final Bundle args = getWorkAnnotatedBundle(1);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
@@ -383,6 +404,15 @@
                 .toIntent();
     }
 
+    private long getGamesSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.gamesSize + profileData.gamesSize;
+        } else {
+            return data.gamesSize;
+        }
+    }
+
     private Intent getMoviesIntent() {
         final Bundle args = getWorkAnnotatedBundle(1);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
@@ -395,27 +425,48 @@
                 .toIntent();
     }
 
-    private Bundle getWorkAnnotatedBundle(int additionalCapacity) {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE)) {
-            final Bundle args = new Bundle(2 + additionalCapacity);
-            args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB,
-                    mIsWorkProfile ? WORK_TAB : PERSONAL_TAB);
-            args.putInt(ManageApplications.EXTRA_WORK_ID, mUserId);
-            return args;
+    private long getMoviesSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.videoAppsSize + profileData.videoAppsSize;
         } else {
-            final Bundle args = new Bundle(2 + additionalCapacity);
-            args.putInt(ProfileSelectFragment.EXTRA_PROFILE,
-                    mIsWorkProfile ? ProfileSelectFragment.ProfileType.WORK
-                            : ProfileSelectFragment.ProfileType.ALL);
-            args.putInt(ManageApplications.EXTRA_WORK_ID, mUserId);
-            return args;
+            return data.videoAppsSize;
         }
     }
 
+    private Bundle getWorkAnnotatedBundle(int additionalCapacity) {
+        final Bundle args = new Bundle(1 + additionalCapacity);
+        args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB,
+                mIsWorkProfile ? WORK_TAB : PERSONAL_TAB);
+        return args;
+    }
+
     private Intent getFilesIntent() {
         return mSvp.findEmulatedForPrivate(mVolume).buildBrowseIntent();
     }
 
+    private long getFilesSize(StorageAsyncLoader.AppsStorageResult data,
+            StorageAsyncLoader.AppsStorageResult profileData) {
+        if (profileData != null) {
+            return data.externalStats.totalBytes
+                    - data.externalStats.audioBytes
+                    - data.externalStats.videoBytes
+                    - data.externalStats.imageBytes
+                    - data.externalStats.appBytes
+                    + profileData.externalStats.totalBytes
+                    - profileData.externalStats.audioBytes
+                    - profileData.externalStats.videoBytes
+                    - profileData.externalStats.imageBytes
+                    - profileData.externalStats.appBytes;
+        } else {
+            return data.externalStats.totalBytes
+                    - data.externalStats.audioBytes
+                    - data.externalStats.videoBytes
+                    - data.externalStats.imageBytes
+                    - data.externalStats.appBytes;
+        }
+    }
+
     private void launchIntent(Intent intent) {
         try {
             final int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, -1);
diff --git a/src/com/android/settings/display/VrDisplayPreferencePicker.java b/src/com/android/settings/display/VrDisplayPreferencePicker.java
index 24102b0..4612779 100644
--- a/src/com/android/settings/display/VrDisplayPreferencePicker.java
+++ b/src/com/android/settings/display/VrDisplayPreferencePicker.java
@@ -23,18 +23,12 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Settings picker screen to what display preferences are applied when device is in VR mode
- */
-@SearchIndexable
 public class VrDisplayPreferencePicker extends RadioButtonPickerFragment {
 
     static final String PREF_KEY_PREFIX = "vr_display_pref_";
@@ -108,7 +102,4 @@
             return PREF_KEY_PREFIX + value;
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.vr_display_settings);
 }
diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java
index 0ff7ee9..3134e79 100644
--- a/src/com/android/settings/dream/CurrentDreamPicker.java
+++ b/src/com/android/settings/dream/CurrentDreamPicker.java
@@ -22,11 +22,9 @@
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.dream.DreamBackend;
 import com.android.settingslib.dream.DreamBackend.DreamInfo;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 
 import java.util.HashMap;
@@ -34,10 +32,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * Settings picker screen for current screen saver
- */
-@SearchIndexable
 public final class CurrentDreamPicker extends RadioButtonPickerFragment {
 
     private DreamBackend mBackend;
@@ -128,7 +122,4 @@
             return key;
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.current_dream_settings);
 }
diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java
index 7208154..1c5e25e 100644
--- a/src/com/android/settings/dream/WhenToDreamPicker.java
+++ b/src/com/android/settings/dream/WhenToDreamPicker.java
@@ -21,19 +21,13 @@
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Settings screen for decide when to start screen saver
- */
-@SearchIndexable
 public class WhenToDreamPicker extends RadioButtonPickerFragment {
 
     private static final String TAG = "WhenToDreamPicker";
@@ -126,7 +120,4 @@
             return key;
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.when_to_dream_settings);
 }
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
index 9ccbcef..67bf687 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
@@ -21,9 +21,7 @@
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +29,6 @@
 /**
  * Fragment for displaying a list of default applications set by profile or device admin.
  */
-@SearchIndexable
 public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
     static final String TAG = "EnterprisePrivacySettings";
 
@@ -59,7 +56,4 @@
         controllers.add(controller);
         return controllers;
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.enterprise_set_default_apps_settings);
 }
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
index cc870c7..507c369 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
@@ -34,10 +34,8 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.fuelgauge.BatterySaverUtils;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
 import com.android.settingslib.widget.RadioButtonPreference;
 
@@ -55,7 +53,6 @@
  * {@link BatterySaverScheduleSeekBarController} for the controller that manages user
  * interactions in this screen.
  */
-@SearchIndexable
 public class BatterySaverScheduleSettings extends RadioButtonPickerFragment {
 
     public BatterySaverScheduleRadioButtonsController mRadioButtonController;
@@ -210,7 +207,4 @@
             return mSummary;
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.battery_saver_schedule_settings);
 }
\ No newline at end of file
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 412a92a..763efaf 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -75,5 +75,12 @@
                     sir.xmlResId = R.xml.gestures;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    // All rows in this screen can lead to a different page, so suppress everything
+                    // from this page to remove duplicates.
+                    return false;
+                }
             };
 }
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index b9b8b87..17a226d 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -27,6 +27,7 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.Settings;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -50,6 +51,8 @@
 
     @VisibleForTesting
     static final int DEFAULT_CARD_COUNT = 3;
+    @VisibleForTesting
+    static final String CONTEXTUAL_CARD_COUNT = "contextual_card_count";
     static final int CARD_CONTENT_LOADER_ID = 1;
 
     private static final String TAG = "ContextualCardLoader";
@@ -130,8 +133,9 @@
         final List<ContextualCard> hiddenCards = new ArrayList<>();
 
         final int size = eligibleCards.size();
+        final int cardCount = getCardCount();
         for (int i = 0; i < size; i++) {
-            if (i < DEFAULT_CARD_COUNT) {
+            if (i < cardCount) {
                 visibleCards.add(eligibleCards.get(i));
             } else {
                 hiddenCards.add(eligibleCards.get(i));
@@ -150,6 +154,14 @@
     }
 
     @VisibleForTesting
+    int getCardCount() {
+        // Return the card count if Settings.Global has KEY_CONTEXTUAL_CARD_COUNT key,
+        // otherwise return the default one.
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                CONTEXTUAL_CARD_COUNT, DEFAULT_CARD_COUNT);
+    }
+
+    @VisibleForTesting
     Cursor getContextualCardsFromProvider() {
         return CardDatabaseHelper.getInstance(mContext).getContextualCards();
     }
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index aa4d53b..cf1e61f 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -19,6 +19,7 @@
 import android.app.PendingIntent;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -184,7 +185,8 @@
 
         // Get all connected devices and sort them.
         return cachedDevices.stream()
-                .filter(device -> device.getDevice().isConnected())
+                .filter(device -> device.getDevice().getBondState() == BluetoothDevice.BOND_BONDED
+                        && device.getDevice().isConnected())
                 .sorted(COMPARATOR).collect(Collectors.toList());
     }
 
diff --git a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
index 1b7f003..c4765c3 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
@@ -15,23 +15,28 @@
  */
 package com.android.settings.homepage.contextualcards.slices;
 
-import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
-
 import static android.provider.Settings.Global.LOW_POWER_MODE;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
 
 import android.annotation.ColorInt;
 import android.app.PendingIntent;
 import android.app.UiModeManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.BatteryManager;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -51,6 +56,7 @@
 
 public class DarkThemeSlice implements CustomSliceable {
     private static final String TAG = "DarkThemeSlice";
+    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
     private static final int BATTERY_LEVEL_THRESHOLD = 50;
     private static final int DELAY_TIME_EXECUTING_DARK_THEME = 200;
 
@@ -59,6 +65,9 @@
     static boolean sKeepSliceShow;
     @VisibleForTesting
     static long sActiveUiSession = -1000;
+    @VisibleForTesting
+    static boolean sSliceClicked = false;
+    static boolean sPreChecked = false;
 
     private final Context mContext;
     private final UiModeManager mUiModeManager;
@@ -78,8 +87,21 @@
             sActiveUiSession = currentUiSession;
             sKeepSliceShow = false;
         }
-        // Dark theme slice will disappear when battery saver is ON.
-        if (mPowerManager.isPowerSaveMode() || (!sKeepSliceShow && !isAvailable(mContext))) {
+
+        // 1. Dark theme slice will disappear when battery saver is ON.
+        // 2. If the slice is shown and the user doesn't toggle it directly, but instead turns on
+        // Dark theme from Quick settings or display page, the card should no longer persist.
+        // This card will persist when user clicks its toggle directly.
+        // 3. If the slice is shown and the user toggles it on (switch to Dark theme) directly,
+        // then user returns to home (launcher), no matter by the Back key or Home gesture.
+        // Next time the Settings displays on screen again this card should no longer persist.
+        if (DEBUG) {
+            Log.d(TAG,
+                    "!sKeepSliceShow = " + !sKeepSliceShow + " !sSliceClicked = "
+                            + !sSliceClicked + " !isAvailable = " + !isAvailable(mContext));
+        }
+        if (mPowerManager.isPowerSaveMode() || ((!sKeepSliceShow || !sSliceClicked)
+                && !isAvailable(mContext))) {
             return new ListBuilder(mContext, CustomSliceRegistry.DARK_THEME_SLICE_URI,
                     ListBuilder.INFINITY)
                     .setIsError(true)
@@ -90,6 +112,12 @@
         @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
         final IconCompat icon =
                 IconCompat.createWithResource(mContext, R.drawable.dark_theme);
+
+        final boolean isChecked = isDarkThemeMode(mContext);
+        if (sPreChecked != isChecked) {
+            // Dark(Night) mode changed and reset the sSliceClicked.
+            resetValue(isChecked, false);
+        }
         return new ListBuilder(mContext, CustomSliceRegistry.DARK_THEME_SLICE_URI,
                 ListBuilder.INFINITY)
                 .setAccentColor(color)
@@ -99,7 +127,7 @@
                         .setSubtitle(mContext.getText(R.string.dark_theme_slice_subtitle))
                         .setPrimaryAction(
                                 SliceAction.createToggle(toggleAction, null /* actionTitle */,
-                                        isDarkThemeMode(mContext))))
+                                        isChecked)))
                 .build();
     }
 
@@ -112,6 +140,10 @@
     public void onNotifyChange(Intent intent) {
         final boolean isChecked = intent.getBooleanExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE,
                 false);
+        // Dark(Night) mode changed by user clicked the toggle in the Dark theme slice.
+        if (isChecked) {
+            resetValue(isChecked, true);
+        }
         // make toggle transition more smooth before dark theme takes effect
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
             mUiModeManager.setNightModeActivated(isChecked);
@@ -143,12 +175,17 @@
     }
 
     @VisibleForTesting
-    boolean isDarkThemeMode(Context context) {
+    static boolean isDarkThemeMode(Context context) {
         final int currentNightMode =
                 context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
         return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
     }
 
+    private void resetValue(boolean preChecked, boolean clicked) {
+        sPreChecked = preChecked;
+        sSliceClicked = clicked;
+    }
+
     public static class DarkThemeWorker extends SliceBackgroundWorker<Void> {
         private final Context mContext;
         private final ContentObserver mContentObserver =
@@ -160,10 +197,12 @@
                         }
                     }
                 };
+        private final HomeKeyReceiver mHomeKeyReceiver;
 
         public DarkThemeWorker(Context context, Uri uri) {
             super(context, uri);
             mContext = context;
+            mHomeKeyReceiver = new HomeKeyReceiver();
         }
 
         @Override
@@ -171,15 +210,55 @@
             mContext.getContentResolver().registerContentObserver(
                     Settings.Global.getUriFor(LOW_POWER_MODE), false /* notifyForDescendants */,
                     mContentObserver);
+            final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+            mContext.registerReceiver(mHomeKeyReceiver, intentFilter);
         }
 
         @Override
         protected void onSliceUnpinned() {
             mContext.getContentResolver().unregisterContentObserver(mContentObserver);
+            mContext.unregisterReceiver(mHomeKeyReceiver);
         }
 
         @Override
         public void close() throws IOException {
         }
     }
+
+    /**
+     * A receiver for Home key and recent app key.
+     */
+    public static class HomeKeyReceiver extends BroadcastReceiver {
+        private static final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey";
+        private static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps";
+        private static final String SYSTEM_DIALOG_REASON_KEY = "reason";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (TextUtils.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intent.getAction())) {
+                if (TextUtils.equals(getTargetKey(context),
+                        intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY))) {
+                    if (DEBUG) {
+                        Log.d(TAG, "HomeKeyReceiver : target key = " + getTargetKey(context));
+                    }
+                    if (DarkThemeSlice.isDarkThemeMode(context)) {
+                        FeatureFactory.getFactory(
+                                context).getSlicesFeatureProvider().newUiSession();
+                    }
+                }
+            }
+        }
+
+        private String getTargetKey(Context context) {
+            if (isGestureNavigationEnabled(context)) {
+                return SYSTEM_DIALOG_REASON_RECENT_APPS;
+            }
+            return SYSTEM_DIALOG_REASON_HOME_KEY;
+        }
+
+        private boolean isGestureNavigationEnabled(Context context) {
+            return NAV_BAR_MODE_GESTURAL == context.getResources().getInteger(
+                    com.android.internal.R.integer.config_navBarInteractionMode);
+        }
+    }
 }
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 1f10e4f..974f2c4 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -37,15 +37,9 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
-import com.android.settingslib.search.SearchIndexable;
 
-/**
- * Settings screen for spell checker
- */
-@SearchIndexable
 public class SpellCheckersSettings extends SettingsPreferenceFragment
         implements OnSwitchChangeListener, OnPreferenceClickListener, OnPreferenceChangeListener {
     private static final String TAG = SpellCheckersSettings.class.getSimpleName();
@@ -280,7 +274,4 @@
         }
         updatePreferenceScreen();
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.spellchecker_prefs);
 }
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index a9c9086..e7aab17 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -31,12 +31,15 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settingslib.Utils;
 import com.android.settingslib.media.LocalMediaManager;
 import com.android.settingslib.media.MediaDevice;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * SliceBackgroundWorker for get MediaDevice list and handle MediaDevice state change event.
@@ -45,10 +48,13 @@
         implements LocalMediaManager.DeviceCallback {
 
     private final Context mContext;
-    private final List<MediaDevice> mMediaDevices = new ArrayList<>();
+    private final Collection<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>();
     private final DevicesChangedBroadcastReceiver mReceiver;
     private final String mPackageName;
 
+    private boolean mIsTouched;
+    private MediaDevice mTopDevice;
+
     @VisibleForTesting
     LocalMediaManager mLocalMediaManager;
 
@@ -62,6 +68,7 @@
     @Override
     protected void onSlicePinned() {
         mMediaDevices.clear();
+        mIsTouched = false;
         if (mLocalMediaManager == null) {
             mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);
         }
@@ -100,8 +107,13 @@
         notifySliceChange();
     }
 
-    public List<MediaDevice> getMediaDevices() {
-        return new ArrayList<>(mMediaDevices);
+    @Override
+    public void onDeviceAttributesChanged() {
+        notifySliceChange();
+    }
+
+    public Collection<MediaDevice> getMediaDevices() {
+        return mMediaDevices;
     }
 
     public void connectDevice(MediaDevice device) {
@@ -111,18 +123,35 @@
     }
 
     public MediaDevice getMediaDeviceById(String id) {
-        return mLocalMediaManager.getMediaDeviceById(mMediaDevices, id);
+        return mLocalMediaManager.getMediaDeviceById(new ArrayList<>(mMediaDevices), id);
     }
 
     public MediaDevice getCurrentConnectedMediaDevice() {
         return mLocalMediaManager.getCurrentConnectedDevice();
     }
 
+    void setIsTouched(boolean isTouched) {
+        mIsTouched = isTouched;
+    }
+
+    boolean getIsTouched() {
+        return mIsTouched;
+    }
+
+    void setTopDevice(MediaDevice device) {
+        mTopDevice = device;
+    }
+
+    MediaDevice getTopDevice() {
+        return mTopDevice;
+    }
+
     private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
-            if (TextUtils.equals(AudioManager.STREAM_DEVICES_CHANGED_ACTION, action)) {
+            if (TextUtils.equals(AudioManager.STREAM_DEVICES_CHANGED_ACTION, action)
+                    && Utils.isAudioModeOngoingCall(mContext)) {
                 notifySliceChange();
             }
         }
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index fbdf01c..47a5d7a 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -40,7 +40,7 @@
 import com.android.settings.slices.SliceBroadcastReceiver;
 import com.android.settingslib.media.MediaDevice;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Show the Media device that can be transfer the media.
@@ -61,7 +61,7 @@
     }
 
     @VisibleForTesting
-    void init(String packageName, MediaDeviceUpdateWorker worker) {
+    void init(MediaDeviceUpdateWorker worker) {
         mWorker = worker;
     }
 
@@ -78,16 +78,21 @@
             return listBuilder.build();
         }
 
-        final List<MediaDevice> devices = getMediaDevices();
+        final Collection<MediaDevice> devices = getMediaDevices();
+        final MediaDeviceUpdateWorker worker = getWorker();
+        final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
+        final boolean isTouched = worker.getIsTouched();
+        // Fix the last top device when user press device to transfer.
+        final MediaDevice topDevice = isTouched ? worker.getTopDevice() : connectedDevice;
 
-        final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();
-        if (connectedDevice != null) {
-            listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
+        if (topDevice != null) {
+            listBuilder.addRow(getActiveDeviceHeaderRow(topDevice));
+            worker.setTopDevice(topDevice);
         }
 
         for (MediaDevice device : devices) {
-            if (connectedDevice == null
-                    || !TextUtils.equals(connectedDevice.getId(), device.getId())) {
+            if (topDevice == null
+                    || !TextUtils.equals(topDevice.getId(), device.getId())) {
                 listBuilder.addRow(getMediaDeviceRow(device));
             }
         }
@@ -131,8 +136,8 @@
         return mWorker;
     }
 
-    private List<MediaDevice> getMediaDevices() {
-        final List<MediaDevice> devices = getWorker().getMediaDevices();
+    private Collection<MediaDevice> getMediaDevices() {
+        final Collection<MediaDevice> devices = getWorker().getMediaDevices();
         return devices;
     }
 
@@ -173,6 +178,7 @@
         final MediaDevice device = worker.getMediaDeviceById(id);
         if (device != null) {
             Log.d(TAG, "onNotifyChange() device name : " + device.getName());
+            worker.setIsTouched(true);
             worker.connectDevice(device);
         }
     }
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index fa0d6a4..326d44b 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -48,7 +48,6 @@
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.SwitchPreference;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -143,6 +142,55 @@
     private Uri mCarrierUri;
 
     /**
+     * APN types for data connections.  These are usage categories for an APN
+     * entry.  One APN entry may support multiple APN types, eg, a single APN
+     * may service regular internet traffic ("default") as well as MMS-specific
+     * connections.<br/>
+     * APN_TYPE_ALL is a special type to indicate that this APN entry can
+     * service all data connections.
+     */
+    public static final String APN_TYPE_ALL = "*";
+    /** APN type for default data traffic */
+    public static final String APN_TYPE_DEFAULT = "default";
+    /** APN type for MMS traffic */
+    public static final String APN_TYPE_MMS = "mms";
+    /** APN type for SUPL assisted GPS */
+    public static final String APN_TYPE_SUPL = "supl";
+    /** APN type for DUN traffic */
+    public static final String APN_TYPE_DUN = "dun";
+    /** APN type for HiPri traffic */
+    public static final String APN_TYPE_HIPRI = "hipri";
+    /** APN type for FOTA */
+    public static final String APN_TYPE_FOTA = "fota";
+    /** APN type for IMS */
+    public static final String APN_TYPE_IMS = "ims";
+    /** APN type for CBS */
+    public static final String APN_TYPE_CBS = "cbs";
+    /** APN type for IA Initial Attach APN */
+    public static final String APN_TYPE_IA = "ia";
+    /** APN type for Emergency PDN. This is not an IA apn, but is used
+     * for access to carrier services in an emergency call situation. */
+    public static final String APN_TYPE_EMERGENCY = "emergency";
+    /** APN type for Mission Critical Services */
+    public static final String APN_TYPE_MCX = "mcx";
+    /** APN type for XCAP */
+    public static final String APN_TYPE_XCAP = "xcap";
+    /** Array of all APN types */
+    public static final String[] APN_TYPES = {APN_TYPE_DEFAULT,
+            APN_TYPE_MMS,
+            APN_TYPE_SUPL,
+            APN_TYPE_DUN,
+            APN_TYPE_HIPRI,
+            APN_TYPE_FOTA,
+            APN_TYPE_IMS,
+            APN_TYPE_CBS,
+            APN_TYPE_IA,
+            APN_TYPE_EMERGENCY,
+            APN_TYPE_MCX,
+            APN_TYPE_XCAP,
+    };
+
+    /**
      * Standard projection for the interesting columns of a normal note.
      */
     private static final String[] sProjection = new String[] {
@@ -356,11 +404,11 @@
         }
 
         final List apnList = Arrays.asList(apnTypes);
-        if (apnList.contains(PhoneConstants.APN_TYPE_ALL)) {
-            Log.d(TAG, "hasAllApns: true because apnList.contains(PhoneConstants.APN_TYPE_ALL)");
+        if (apnList.contains(APN_TYPE_ALL)) {
+            Log.d(TAG, "hasAllApns: true because apnList.contains(APN_TYPE_ALL)");
             return true;
         }
-        for (String apn : PhoneConstants.APN_TYPES) {
+        for (String apn : APN_TYPES) {
             if (!apnList.contains(apn)) {
                 return false;
             }
@@ -1190,9 +1238,9 @@
         String userEnteredApnType = mApnType.getText();
         if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
         if ((TextUtils.isEmpty(userEnteredApnType)
-                || PhoneConstants.APN_TYPE_ALL.equals(userEnteredApnType))
+                || APN_TYPE_ALL.equals(userEnteredApnType))
                 && !ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
-            String[] apnTypeList = PhoneConstants.APN_TYPES;
+            String[] apnTypeList = APN_TYPES;
             if (TextUtils.isEmpty(userEnteredApnType) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
                 apnTypeList = mDefaultApnTypes;
             }
@@ -1203,9 +1251,9 @@
             for (String apnType : apnTypeList) {
                 // add APN type if it is not read-only and is not wild-cardable
                 if (!readOnlyApnTypes.contains(apnType)
-                        && !apnType.equals(PhoneConstants.APN_TYPE_IA)
-                        && !apnType.equals(PhoneConstants.APN_TYPE_EMERGENCY)
-                        && !apnType.equals(PhoneConstants.APN_TYPE_MCX)) {
+                        && !apnType.equals(APN_TYPE_IA)
+                        && !apnType.equals(APN_TYPE_EMERGENCY)
+                        && !apnType.equals(APN_TYPE_MCX)) {
                     if (first) {
                         first = false;
                     } else {
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index 88a13ae..eb6c9b1 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -174,9 +174,6 @@
 
         final TelephonyManager updatedTelephonyManager =
                 mTelephonyManager.createForSubscriptionId(subId);
-        if (updatedTelephonyManager == null) {
-            return;
-        }
 
         // restart monitoring when subscription has been changed
         mTelephonyManager.listen(mPhoneStateListener,
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
index effa38a..9ecab3b 100644
--- a/src/com/android/settings/network/NetworkScorerPicker.java
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -31,8 +31,6 @@
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.RadioButtonPreference;
 
 import java.util.List;
@@ -40,7 +38,6 @@
 /**
  * Fragment for choosing default network scorer.
  */
-@SearchIndexable
 public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
         RadioButtonPreference.OnClickListener {
 
@@ -145,7 +142,4 @@
     NetworkScoreManager createNetworkScorerManager(Context context) {
         return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.network_scorer_picker_prefs);
 }
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 6220d45..41c7c14 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -80,39 +80,10 @@
             return sAvailableResultsForTesting;
         }
         final SubscriptionManager subMgr = context.getSystemService(SubscriptionManager.class);
-        final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
 
         final List<SubscriptionInfo> subscriptions =
                 new ArrayList<>(emptyIfNull(subMgr.getSelectableSubscriptionInfoList()));
 
-        // Look for inactive but present physical SIMs that are missing from the selectable list.
-        final List<UiccSlotInfo> missing = new ArrayList<>();
-        final UiccSlotInfo[] slotsInfo = telMgr.getUiccSlotsInfo();
-        for (int i = 0; slotsInfo != null && i < slotsInfo.length; i++) {
-            final UiccSlotInfo slotInfo = slotsInfo[i];
-            if (isInactiveInsertedPSim(slotInfo)) {
-                final int index = slotInfo.getLogicalSlotIdx();
-                final String cardId = slotInfo.getCardId();
-
-                final boolean found = subscriptions.stream().anyMatch(info ->
-                        index == info.getSimSlotIndex() && cardId.equals(info.getCardString()));
-                if (!found) {
-                    missing.add(slotInfo);
-                }
-            }
-        }
-        if (missing.isEmpty()) {
-            return subscriptions;
-        }
-        for (SubscriptionInfo info : subMgr.getAllSubscriptionInfoList()) {
-            for (UiccSlotInfo slotInfo : missing) {
-                if (info.getSimSlotIndex() == slotInfo.getLogicalSlotIdx()
-                        && info.getCardString().equals(slotInfo.getCardId())) {
-                    subscriptions.add(info);
-                    break;
-                }
-            }
-        }
         return subscriptions;
     }
 
@@ -144,24 +115,7 @@
             return null;
         }
 
-        if (subInfo.isEmbedded()) {
-            return subInfo;
-        }
-
-        // Look for physical SIM which presented in slots no mater active or not.
-        final UiccSlotInfo[] slotsInfo = getUiccSlotsInfo(context);
-        if (slotsInfo == null) {
-            return null;
-        }
-        for (UiccSlotInfo slotInfo : slotsInfo) {
-            if ((!slotInfo.getIsEuicc())
-                    && (slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT)
-                    && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())
-                    && TextUtils.equals(slotInfo.getCardId(), subInfo.getCardString())) {
-                return subInfo;
-            }
-        }
-        return null;
+        return subInfo;
     }
 
     private static UiccSlotInfo [] getUiccSlotsInfo(Context context) {
@@ -278,12 +232,11 @@
      * Get phoneId or logical slot index for a subId if active, or INVALID_PHONE_INDEX if inactive.
      */
     public static int getPhoneId(Context context, int subId) {
-        SubscriptionManager subManager = (SubscriptionManager)
-                context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
         if (subManager == null) {
             return INVALID_SIM_SLOT_INDEX;
         }
-        SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
+        final SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
         if (info == null) {
             return INVALID_SIM_SLOT_INDEX;
         }
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index 6c6c959..9021a26 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -61,7 +61,8 @@
     public static final String SHARED_PREF = "tether_options";
 
     @VisibleForTesting
-    static final String WIFI_TETHER_KEY = WifiTetherDisablePreferenceController.PREF_KEY;
+    static final String WIFI_TETHER_KEY =
+            WifiTetherDisablePreferenceController.KEY_ENABLE_WIFI_TETHERING;
     @VisibleForTesting
     static final String USB_TETHER_KEY = UsbTetherPreferenceController.PREF_KEY;
     @VisibleForTesting
diff --git a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
index bf0e208..99fcfcd 100644
--- a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
+++ b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
@@ -49,8 +49,11 @@
 
     private static final String TAG = "WifiTetherDisablePreferenceController";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-    @VisibleForTesting
-    static final String PREF_KEY = "enable_wifi_tethering";
+    public static final String PREF_KEY = "disable_wifi_tethering";
+
+    // This KEY is used for a shared preference value, not for any displayed preferences.
+    public static final String KEY_ENABLE_WIFI_TETHERING = "enable_wifi_tethering";
+
     private final ConnectivityManager mCm;
     private boolean mBluetoothTetherEnabled;
     private boolean mUSBTetherEnabled;
@@ -111,7 +114,7 @@
         mPreference = screen.findPreference(PREF_KEY);
         if (mPreference != null && mPreference instanceof SwitchPreference) {
             ((SwitchPreference) mPreference)
-                    .setChecked(!mSharedPreferences.getBoolean(PREF_KEY, true));
+                    .setChecked(!mSharedPreferences.getBoolean(KEY_ENABLE_WIFI_TETHERING, true));
             mPreference.setOnPreferenceChangeListener(this);
         }
         updateState(mPreference);
@@ -155,11 +158,11 @@
     public boolean onPreferenceChange(Preference preference, Object o) {
         // The shared preference's value is in the opposite of this preference's value.
         final boolean enableWifi = !(boolean) o;
-        if (true) {
+        if (DEBUG) {
             Log.d(TAG, "check state changing to " + o);
         }
         final SharedPreferences.Editor editor = mSharedPreferences.edit();
-        editor.putBoolean(PREF_KEY, enableWifi);
+        editor.putBoolean(KEY_ENABLE_WIFI_TETHERING, enableWifi);
         editor.apply();
         return true;
     }
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index 98c1f5b..dd68129 100644
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -52,7 +52,7 @@
 
     public ApnPreferenceController(Context context, String key) {
         super(context, key);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
         mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));
     }
 
diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
index 2348f70..99009c9 100644
--- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
@@ -28,7 +28,7 @@
 
     @Override
     protected SubscriptionInfo getDefaultSubscriptionInfo() {
-        return mManager.getDefaultVoiceSubscriptionInfo();
+        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/CarrierPreferenceController.java b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
index c381dc4..e0e21d4 100644
--- a/src/com/android/settings/network/telephony/CarrierPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
@@ -38,7 +38,7 @@
 
     public CarrierPreferenceController(Context context, String key) {
         super(context, key);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
     }
 
     public void init(int subId) {
diff --git a/src/com/android/settings/network/telephony/CellInfoUtil.java b/src/com/android/settings/network/telephony/CellInfoUtil.java
index 3129694..7412428 100644
--- a/src/com/android/settings/network/telephony/CellInfoUtil.java
+++ b/src/com/android/settings/network/telephony/CellInfoUtil.java
@@ -33,8 +33,6 @@
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 
-import com.android.internal.telephony.OperatorInfo;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -52,7 +50,7 @@
     /**
      * Returns the title of the network obtained in the manual search.
      *
-     * @param cellId contains the information of the network.
+     * @param cellId contains the identity of the network.
      * @param networkMccMnc contains the MCCMNC string of the network
      * @return Long Name if not null/empty, otherwise Short Name if not null/empty,
      * else MCCMNC string.
@@ -101,34 +99,6 @@
         return cellId;
     }
 
-    /**
-     * Creates a CellInfo object from OperatorInfo. GsmCellInfo is used here only because
-     * operatorInfo does not contain technology type while CellInfo is an abstract object that
-     * requires to specify technology type. It doesn't matter which CellInfo type to use here, since
-     * we only want to wrap the operator info and PLMN to a CellInfo object.
-     */
-    public static CellInfo convertOperatorInfoToCellInfo(OperatorInfo operatorInfo) {
-        final String operatorNumeric = operatorInfo.getOperatorNumeric();
-        String mcc = null;
-        String mnc = null;
-        if (operatorNumeric != null && operatorNumeric.matches("^[0-9]{5,6}$")) {
-            mcc = operatorNumeric.substring(0, 3);
-            mnc = operatorNumeric.substring(3);
-        }
-        final CellIdentityGsm cig = new CellIdentityGsm(
-                Integer.MAX_VALUE /* lac */,
-                Integer.MAX_VALUE /* cid */,
-                Integer.MAX_VALUE /* arfcn */,
-                Integer.MAX_VALUE /* bsic */,
-                mcc,
-                mnc,
-                operatorInfo.getOperatorAlphaLong(),
-                operatorInfo.getOperatorAlphaShort());
-
-        final CellInfoGsm ci = new CellInfoGsm();
-        ci.setCellIdentity(cig);
-        return ci;
-    }
 
     /** Convert a list of cellInfos to readable string without sensitive info. */
     public static String cellInfoListToString(List<CellInfo> cellInfos) {
diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
index 46f398c..da2bff7 100644
--- a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
@@ -28,8 +28,6 @@
 
 import androidx.preference.Preference;
 
-import com.android.internal.telephony.PhoneConstants;
-
 /**
  * Preference controller for "Data service setup"
  */
@@ -49,14 +47,12 @@
 
     @Override
     public int getAvailabilityStatus(int subId) {
-        final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
-                == PhoneConstants.LTE_ON_CDMA_TRUE;
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
         return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
                 && carrierConfig != null
                 && !carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
-                && isLteOnCdma && !TextUtils.isEmpty(mSetupUrl)
+                && mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index f7ed1d0..ca673a1 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -31,7 +31,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -40,10 +39,8 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settings.R;
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -83,8 +80,6 @@
     public int getAvailabilityStatus(int subId) {
         boolean visible;
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
-        final TelephonyManager telephonyManager = TelephonyManager
-                .from(mContext).createForSubscriptionId(subId);
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             visible = false;
         } else if (carrierConfig == null) {
@@ -132,13 +127,14 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object object) {
-        final int settingsMode = Integer.parseInt((String) object);
+        final int newPreferredNetworkMode = Integer.parseInt((String) object);
 
-        if (mTelephonyManager.setPreferredNetworkType(mSubId, settingsMode)) {
+        if (mTelephonyManager.setPreferredNetworkTypeBitmask(
+                MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode))) {
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                    settingsMode);
-            updatePreferenceValueAndSummary((ListPreference) preference, settingsMode);
+                    newPreferredNetworkMode);
+            updatePreferenceValueAndSummary((ListPreference) preference, newPreferredNetworkMode);
             return true;
         }
 
@@ -151,9 +147,7 @@
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(mSubId);
 
-        final boolean isLteOnCdma =
-                mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
-        mIsGlobalCdma = isLteOnCdma
+        mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
                 && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
         mShow4GForLTE = carrierConfig != null
                 ? carrierConfig.getBoolean(
@@ -170,24 +164,22 @@
     private int getPreferredNetworkMode() {
         return Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
     }
 
     private void updatePreferenceEntries(ListPreference preference) {
         final int phoneType = mTelephonyManager.getPhoneType();
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
+        if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
             final int lteForced = android.provider.Settings.Global.getInt(
                     mContext.getContentResolver(),
                     android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId,
                     0);
-            final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
-                    == PhoneConstants.LTE_ON_CDMA_TRUE;
             final int settingsNetworkMode = android.provider.Settings.Global.getInt(
                     mContext.getContentResolver(),
                     android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                    Phone.PREFERRED_NT_MODE);
-            if (isLteOnCdma) {
+                    TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
+            if (mTelephonyManager.isGlobalModeEnabled()) {
                 if (lteForced == 0) {
                     preference.setEntries(
                             R.array.enabled_networks_cdma_choices);
@@ -221,7 +213,7 @@
                     }
                 }
             }
-        } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+        } else if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
             if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
                 preference.setEntries(
                         R.array.enabled_networks_tdscdma_choices);
@@ -529,7 +521,7 @@
                     preference.setValue(
                             Integer.toString(TelephonyManagerConstants
                                     .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
-                    if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+                    if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                             || mIsGlobalCdma
                             || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                         preference.setSummary(R.string.network_global);
@@ -553,7 +545,7 @@
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
                 preference.setValue(
                         Integer.toString(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA));
-                if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+                if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                     preference.setSummary(R.string.network_global);
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
index b428b22..07b808f 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -50,8 +50,8 @@
 
     @Override
     public int getAvailabilityStatus(int subId) {
-        final TelephonyManager telephonyManager = TelephonyManager
-                .from(mContext).createForSubscriptionId(subId);
+        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(subId);
         return (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
                 && !telephonyManager.isDataEnabled()
                 && telephonyManager.isApnMetered(ApnSetting.TYPE_MMS))
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index a6183e9..c8a1e98 100644
--- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -86,7 +86,8 @@
                 final SubscriptionInfo currentSubInfo =
                         mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
                 final SubscriptionInfo nextSubInfo =
-                        mSubscriptionManager.getDefaultDataSubscriptionInfo();
+                        mSubscriptionManager.getActiveSubscriptionInfo(
+                                mSubscriptionManager.getDefaultDataSubscriptionId());
 
                 final String previousName = (nextSubInfo == null)
                         ? getContext().getResources().getString(
diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index c70ae1a..40c747c 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -147,8 +147,8 @@
     }
 
     protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {
-        final SubscriptionInfo defaultSubscription =
-                subscriptionManager.getDefaultDataSubscriptionInfo();
+        final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo(
+                subscriptionManager.getDefaultDataSubscriptionId());
         if (defaultSubscription == null) {
             return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription
         }
@@ -157,8 +157,8 @@
     }
 
     private CharSequence getSummary() {
-        final SubscriptionInfo defaultSubscription =
-                mSubscriptionManager.getDefaultDataSubscriptionInfo();
+        final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(
+                mSubscriptionManager.getDefaultDataSubscriptionId());
         if (defaultSubscription == null) {
             return null; // no summary text
         }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index bd9b709..955b80f 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -50,8 +50,6 @@
 
 import com.android.ims.ImsException;
 import com.android.ims.ImsManager;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -100,12 +98,12 @@
      * Returns true if Wifi calling is enabled for at least one subscription.
      */
     public static boolean isWifiCallingEnabled(Context context) {
-        final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
-        if (subManager == null) {
-            Log.e(TAG, "isWifiCallingEnabled: couldn't get system service.");
+        final int[] subIds = getActiveSubscriptionIdList(context);
+        if (ArrayUtils.isEmpty(subIds)) {
+            Log.d(TAG, "isWifiCallingEnabled: subIds is empty");
             return false;
         }
-        for (int subId : subManager.getActiveSubscriptionIdList()) {
+        for (int subId : subIds) {
             if (isWifiCallingEnabled(context, subId)) {
                 return true;
             }
@@ -299,7 +297,7 @@
                 CarrierConfigManager.class).getConfigForSubId(subId);
 
 
-        if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+        if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
             return true;
         } else if (carrierConfig != null
                 && !carrierConfig.getBoolean(
@@ -312,7 +310,7 @@
             final int settingsNetworkMode = android.provider.Settings.Global.getInt(
                     context.getContentResolver(),
                     android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
-                    Phone.PREFERRED_NT_MODE);
+                    TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
             if (settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA
                     || settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
                 return true;
@@ -339,7 +337,7 @@
         final int networkMode = android.provider.Settings.Global.getInt(
                 context.getContentResolver(),
                 android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
         if (isWorldMode(context, subId)) {
             if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
                     || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
@@ -358,7 +356,7 @@
         final PersistableBundle carrierConfig = context.getSystemService(
                 CarrierConfigManager.class).getConfigForSubId(subId);
 
-        if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
+        if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) {
             return true;
         } else if (carrierConfig != null
                 && !carrierConfig.getBoolean(
@@ -404,7 +402,7 @@
         final int networkMode = android.provider.Settings.Global.getInt(
                 context.getContentResolver(),
                 android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
         if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
                 && isWorldMode(context, subId)) {
             return false;
@@ -466,9 +464,7 @@
      * otherwise return {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}
      */
     public static int getSearchableSubscriptionId(Context context) {
-        final SubscriptionManager subscriptionManager = context.getSystemService(
-                SubscriptionManager.class);
-        final int subIds[] = subscriptionManager.getActiveSubscriptionIdList();
+        final int[] subIds = getActiveSubscriptionIdList(context);
 
         return subIds.length >= 1 ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
@@ -485,14 +481,12 @@
      */
     public static int getAvailability(Context context, int defSubId,
             TelephonyAvailabilityCallback callback) {
-        final SubscriptionManager subscriptionManager = context.getSystemService(
-                SubscriptionManager.class);
         if (defSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             // If subId has been set, return the corresponding status
             return callback.getAvailabilityStatus(defSubId);
         } else {
             // Otherwise, search whether there is one subId in device that support this preference
-            final int[] subIds = subscriptionManager.getActiveSubscriptionIdList();
+            final int[] subIds = getActiveSubscriptionIdList(context);
             if (ArrayUtils.isEmpty(subIds)) {
                 return callback.getAvailabilityStatus(
                         SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -522,7 +516,7 @@
         final int networkMode = android.provider.Settings.Global.getInt(
                 context.getContentResolver(),
                 android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
         if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
                 || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
                 || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA
@@ -640,4 +634,168 @@
                 Arrays.asList(TextUtils.split(countriesListString.toLowerCase(), ","));
         return unsupportedCountries.contains(country);
     }
+
+    private static int[] getActiveSubscriptionIdList(Context context) {
+        final SubscriptionManager subscriptionManager = context.getSystemService(
+                SubscriptionManager.class);
+        final List<SubscriptionInfo> subInfoList =
+                subscriptionManager.getActiveSubscriptionInfoList();
+        if (subInfoList == null) {
+            return new int[0];
+        }
+        int[] activeSubIds = new int[subInfoList.size()];
+        int i = 0;
+        for (SubscriptionInfo subInfo : subInfoList) {
+            activeSubIds[i] = subInfo.getSubscriptionId();
+            i++;
+        }
+        return activeSubIds;
+    }
+
+    /**
+     *  Imported from {@link android.telephony.RadioAccessFamily}
+     */
+    public static long getRafFromNetworkType(int type) {
+        switch (type) {
+            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
+                return TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
+                return TelephonyManagerConstants.GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
+                return TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
+                return TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
+                return TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
+                return TelephonyManagerConstants.LTE;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
+                return TelephonyManagerConstants.CDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
+                return TelephonyManagerConstants.EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
+                return TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                return TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_ONLY):
+                return TelephonyManagerConstants.NR;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA):
+                return TelephonyManagerConstants.NR
+                        | TelephonyManagerConstants.LTE
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA
+                        | TelephonyManagerConstants.CDMA
+                        | TelephonyManagerConstants.EVDO
+                        | TelephonyManagerConstants.GSM
+                        | TelephonyManagerConstants.WCDMA;
+
+            default:
+                return TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
+        }
+    }
 }
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index 97894b1..7173ccc 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -57,7 +57,6 @@
     private List<String> mForbiddenPlmns;
     private int mLevel = LEVEL_NONE;
     private boolean mShow4GForLTE;
-    private boolean mUseNewApi;
 
     public NetworkOperatorPreference(Context context, CellInfo cellinfo,
             List<String> forbiddenPlmns, boolean show4GForLTE) {
@@ -76,8 +75,6 @@
         super(context);
         mForbiddenPlmns = forbiddenPlmns;
         mShow4GForLTE = show4GForLTE;
-        mUseNewApi = context.getResources().getBoolean(
-                com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI);
     }
 
     /**
@@ -218,7 +215,7 @@
     }
 
     private void updateIcon(int level) {
-        if (!mUseNewApi || level < 0 || level >= NUM_SIGNAL_STRENGTH_BINS) {
+        if (level < 0 || level >= NUM_SIGNAL_STRENGTH_BINS) {
             return;
         }
         final Context context = getContext();
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
index 185090b..eb0d020 100644
--- a/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network.telephony;
 
-import android.annotation.IntDef;
 import android.telephony.AccessNetworkConstants.AccessNetworkType;
 import android.telephony.CellInfo;
 import android.telephony.NetworkScan;
@@ -26,20 +25,8 @@
 import android.telephony.TelephonyScanManager;
 import android.util.Log;
 
-import com.android.internal.telephony.CellNetworkScanResult;
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.List;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
 
 /**
  * A helper class that builds the common interface and performs the network scan for two different
@@ -82,33 +69,6 @@
         void onError(int errorCode);
     }
 
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS, NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS})
-    public @interface NetworkQueryType {}
-
-    /**
-     * Performs the network scan using {@link TelephonyManager#getAvailableNetworks()}. The network
-     * scan results won't be returned to the caller until the network scan is completed.
-     *
-     * <p> This is typically used when the modem doesn't support the new network scan api
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
-     */
-    public static final int NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS = 1;
-
-    /**
-     * Performs the network scan using {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)} The network scan
-     * results will be returned to the caller periodically in a small time window until the network
-     * scan is completed. The complete results should be returned in the last called of
-     * {@link NetworkScanCallback#onResults(List)}.
-     *
-     * <p> This is recommended to be used if modem supports the new network scan api
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}
-     */
-    public static final int NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS = 2;
-
     /** The constants below are used in the async network scan. */
     private static final boolean INCREMENTAL_RESULTS = true;
     private static final int SEARCH_PERIODICITY_SEC = 5;
@@ -138,7 +98,7 @@
                             new RadioAccessSpecifier(
                                     AccessNetworkType.NGRAN,
                                     null /* bands */,
-                                    null /* channels */),
+                                    null /* channels */)
                     },
                     SEARCH_PERIODICITY_SEC,
                     MAX_SEARCH_TIME_SEC,
@@ -153,9 +113,6 @@
 
     private NetworkScan mNetworkScanRequester;
 
-    /** Callbacks for sync network scan */
-    private ListenableFuture<List<CellInfo>> mNetworkScanFuture;
-
     public NetworkScanHelper(TelephonyManager tm, NetworkScanCallback callback, Executor executor) {
         mTelephonyManager = tm;
         mNetworkScanCallback = callback;
@@ -164,63 +121,38 @@
     }
 
     /**
-     * Performs a network scan for the given type {@code type}.
-     * {@link #NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS} is recommended if modem supports
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
+     * Request a network scan.
      *
-     * @param type used to tell which network scan API should be used.
+     * Performs the network scan using {@link TelephonyManager#requestNetworkScan(
+     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)} The network scan
+     * results will be returned to the caller periodically in a small time window until the network
+     * scan is completed. The complete results should be returned in the last called of
+     * {@link NetworkScanCallback#onResults(List)}.
      */
-    public void startNetworkScan(@NetworkQueryType int type) {
-        if (type == NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS) {
-            mNetworkScanFuture = SettableFuture.create();
-            Futures.addCallback(mNetworkScanFuture, new FutureCallback<List<CellInfo>>() {
-                @Override
-                public void onSuccess(List<CellInfo> result) {
-                    onResults(result);
-                    onComplete();
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    if (t instanceof CancellationException) {
-                        return;
-                    }
-                    int errCode = Integer.parseInt(t.getMessage());
-                    onError(errCode);
-                }
-            }, MoreExecutors.directExecutor());
-            mExecutor.execute(new NetworkScanSyncTask(
-                    mTelephonyManager, (SettableFuture) mNetworkScanFuture));
-        } else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
-            if (mNetworkScanRequester != null) {
-                return;
-            }
-            mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
-                    NETWORK_SCAN_REQUEST,
-                    mExecutor,
-                    mInternalNetworkScanCallback);
-            if (mNetworkScanRequester == null) {
-                onError(NetworkScan.ERROR_RADIO_INTERFACE_ERROR);
-            }
+    public void startNetworkScan() {
+        if (mNetworkScanRequester != null) {
+            return;
+        }
+        mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
+                NETWORK_SCAN_REQUEST,
+                mExecutor,
+                mInternalNetworkScanCallback);
+        if (mNetworkScanRequester == null) {
+            onError(NetworkScan.ERROR_RADIO_INTERFACE_ERROR);
         }
     }
 
     /**
-     * The network scan of type {@link #NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS} can't be stopped,
-     * however, the result of the current network scan won't be returned to the callback after
-     * calling this method.
+     * Stops the network scan.
+     *
+     * Use this method to stop an ongoing scan. When user requests a new scan, a {@link NetworkScan}
+     * object will be returned, and the user can stop the scan by calling this method.
      */
     public void stopNetworkQuery() {
         if (mNetworkScanRequester != null) {
             mNetworkScanRequester.stopScan();
             mNetworkScanRequester = null;
         }
-
-        if (mNetworkScanFuture != null) {
-            mNetworkScanFuture.cancel(true /* mayInterruptIfRunning */);
-            mNetworkScanFuture = null;
-        }
     }
 
     private void onResults(List<CellInfo> cellInfos) {
@@ -235,23 +167,6 @@
         mNetworkScanCallback.onError(errCode);
     }
 
-    /**
-     * Converts the status code of {@link CellNetworkScanResult} to one of the
-     * {@link NetworkScan.ScanErrorCode}.
-     * @param errCode status code from {@link CellNetworkScanResult}.
-     *
-     * @return one of the scan error code from {@link NetworkScan.ScanErrorCode}.
-     */
-    private static int convertToScanErrorCode(int errCode) {
-        switch (errCode) {
-            case CellNetworkScanResult.STATUS_RADIO_NOT_AVAILABLE:
-                return NetworkScan.ERROR_RADIO_INTERFACE_ERROR;
-            case CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE:
-            default:
-                return NetworkScan.ERROR_MODEM_ERROR;
-        }
-    }
-
     private final class NetworkScanCallbackImpl extends TelephonyScanManager.NetworkScanCallback {
         public void onResults(List<CellInfo> results) {
             Log.d(TAG, "Async scan onResults() results = "
@@ -269,35 +184,4 @@
             NetworkScanHelper.this.onError(errCode);
         }
     }
-
-    private static final class NetworkScanSyncTask implements Runnable {
-        private final SettableFuture<List<CellInfo>> mCallback;
-        private final TelephonyManager mTelephonyManager;
-
-        NetworkScanSyncTask(
-                TelephonyManager telephonyManager, SettableFuture<List<CellInfo>> callback) {
-            mTelephonyManager = telephonyManager;
-            mCallback = callback;
-        }
-
-        @Override
-        public void run() {
-            final CellNetworkScanResult result = mTelephonyManager.getAvailableNetworks();
-            if (result.getStatus() == CellNetworkScanResult.STATUS_SUCCESS) {
-                final List<CellInfo> cellInfos = result.getOperators()
-                        .stream()
-                        .map(operatorInfo
-                                -> CellInfoUtil.convertOperatorInfoToCellInfo(operatorInfo))
-                        .collect(Collectors.toList());
-                Log.d(TAG, "Sync network scan completed, cellInfos = "
-                        + CellInfoUtil.cellInfoListToString(cellInfos));
-                mCallback.set(cellInfos);
-            } else {
-                final Throwable error = new Throwable(
-                        Integer.toString(convertToScanErrorCode(result.getStatus())));
-                mCallback.setException(error);
-                Log.d(TAG, "Sync network scan error, ex = " + error);
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 8b3e913..584848f 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -93,8 +93,6 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mUseNewApi = getContext().getResources().getBoolean(
-                com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI);
         mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID);
 
         mPreferenceCategory = findPreference(PREF_KEY_NETWORK_OPERATORS);
@@ -468,10 +466,7 @@
         if (mNetworkScanHelper != null) {
             mRequestIdManualNetworkScan = getNewRequestId();
             mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
-            mNetworkScanHelper.startNetworkScan(
-                    mUseNewApi
-                            ? NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS
-                            : NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
+            mNetworkScanHelper.startNetworkScan();
         }
     }
 
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 72be4f4..e0ecccc 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -26,8 +26,6 @@
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.R;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
@@ -50,8 +48,6 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
-        final TelephonyManager telephonyManager = TelephonyManager
-                .from(mContext).createForSubscriptionId(subId);
         boolean visible;
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             visible = false;
@@ -82,12 +78,13 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object object) {
-        final int settingsMode = Integer.parseInt((String) object);
+        final int newPreferredNetworkMode = Integer.parseInt((String) object);
 
-        if (mTelephonyManager.setPreferredNetworkType(mSubId, settingsMode)) {
+        if (mTelephonyManager.setPreferredNetworkTypeBitmask(
+                MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode))) {
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                    settingsMode);
+                    newPreferredNetworkMode);
             return true;
         }
 
@@ -100,16 +97,14 @@
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(mSubId);
 
-        final boolean isLteOnCdma =
-                mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
-        mIsGlobalCdma = isLteOnCdma
+        mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
                 && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
     }
 
     private int getPreferredNetworkMode() {
         return Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
     }
 
     private int getPreferredNetworkModeSummaryResId(int NetworkMode) {
@@ -129,12 +124,9 @@
             case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
                 return R.string.preferred_network_mode_gsm_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
-                switch (mTelephonyManager.getLteOnCdmaMode()) {
-                    case PhoneConstants.LTE_ON_CDMA_TRUE:
-                        return R.string.preferred_network_mode_cdma_summary;
-                    default:
-                        return R.string.preferred_network_mode_cdma_evdo_summary;
-                }
+                return mTelephonyManager.isGlobalModeEnabled()
+                        ? R.string.preferred_network_mode_cdma_summary
+                        : R.string.preferred_network_mode_cdma_evdo_summary;
             case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
                 return R.string.preferred_network_mode_cdma_only_summary;
             case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
@@ -156,7 +148,7 @@
             case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+                if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                     return R.string.preferred_network_mode_global_summary;
diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
index bf22fba..bd45226 100644
--- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -54,7 +54,7 @@
         super.onAttach(context);
         final Bundle args = getArguments();
         mSubId = args.getInt(SUB_ID_KEY);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
index b999219..96ed771 100644
--- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
@@ -28,7 +28,7 @@
 
     @Override
     protected SubscriptionInfo getDefaultSubscriptionInfo() {
-        return mManager.getDefaultSmsSubscriptionInfo();
+        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/TelephonyConstants.java b/src/com/android/settings/network/telephony/TelephonyConstants.java
index cfae572..42b57e0 100644
--- a/src/com/android/settings/network/telephony/TelephonyConstants.java
+++ b/src/com/android/settings/network/telephony/TelephonyConstants.java
@@ -17,6 +17,8 @@
 package com.android.settings.network.telephony;
 
 
+import android.telephony.TelephonyManager;
+
 /**
  * Contains hidden constants copied from the platform.
  */
@@ -133,6 +135,35 @@
 
         /** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */
         public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;
+
+
+        // Grouping of RAFs
+        // imported from {@link android.telephony.RadioAccessFamily}
+        // 2G
+        public static final long GSM = TelephonyManager.NETWORK_TYPE_BITMASK_GSM
+                | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS
+                | TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
+        public static final long CDMA = TelephonyManager.NETWORK_TYPE_BITMASK_CDMA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
+
+        // 3G
+        public static final long EVDO = TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0
+                | TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A
+                | TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B
+                | TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
+        public static final long HS = TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_HSPA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
+        public static final long WCDMA = HS | TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
+
+        // 4G
+        public static final long LTE = TelephonyManager.NETWORK_TYPE_BITMASK_LTE
+                | TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
+
+        // 5G
+        public static final long NR = TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+
     }
 
 
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
index e6c1c22..e714fbe 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -19,13 +19,13 @@
 import android.content.Context;
 import android.os.SystemProperties;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.internal.telephony.Phone;
 import com.android.settings.network.telephony.MobileNetworkUtils;
 
 /**
@@ -56,8 +56,9 @@
         final ListPreference listPreference = (ListPreference) preference;
         listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.PREFERRED_CDMA_SUBSCRIPTION);
-        if (mode != Phone.CDMA_SUBSCRIPTION_UNKNOWN) {
+                Settings.Global.CDMA_SUBSCRIPTION_MODE,
+                TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM);
+        if (mode != TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN) {
             listPreference.setValue(Integer.toString(mode));
         }
     }
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index c988bf8..e90a240 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -23,7 +23,6 @@
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.internal.telephony.Phone;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 /**
@@ -53,7 +52,7 @@
         final int settingsNetworkMode = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
-                Phone.PREFERRED_NT_MODE);
+                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
         listPreference.setEnabled(
                 settingsNetworkMode != TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
     }
diff --git a/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
index e867556..bf70080 100644
--- a/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
@@ -19,6 +19,7 @@
 import android.app.AutomaticZenRule;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Slog;
 
 import androidx.preference.Preference;
 
diff --git a/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
index 6000ead..b3630a0 100644
--- a/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.core.text.BidiFormatter;
@@ -121,29 +122,30 @@
             mApplicationsState.ensureIcon(entry);
             for (NotificationChannel channel : mNotificationBackend
                     .getNotificationChannelsBypassingDnd(pkg, entry.info.uid).getList()) {
+                if (!TextUtils.isEmpty(channel.getConversationId())) {
+                    // conversation channels that bypass dnd will be shown on the People page
+                    continue;
+                }
                 Preference pref = new AppPreference(mPrefContext);
                 pref.setKey(pkg + "|" + channel.getId());
                 pref.setTitle(BidiFormatter.getInstance().unicodeWrap(entry.label));
                 pref.setIcon(entry.icon);
                 pref.setSummary(BidiFormatter.getInstance().unicodeWrap(channel.getName()));
 
-                pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        Bundle args = new Bundle();
-                        args.putString(AppInfoBase.ARG_PACKAGE_NAME, entry.info.packageName);
-                        args.putInt(AppInfoBase.ARG_PACKAGE_UID, entry.info.uid);
-                        args.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
-                        new SubSettingLauncher(mContext)
-                                .setDestination(ChannelNotificationSettings.class.getName())
-                                .setArguments(args)
-                                .setTitleRes(R.string.notification_channel_title)
-                                .setResultListener(mHostFragment, 0)
-                                .setSourceMetricsCategory(
-                                        SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP)
-                                .launch();
-                        return true;
-                    }
+                pref.setOnPreferenceClickListener(preference -> {
+                    Bundle args = new Bundle();
+                    args.putString(AppInfoBase.ARG_PACKAGE_NAME, entry.info.packageName);
+                    args.putInt(AppInfoBase.ARG_PACKAGE_UID, entry.info.uid);
+                    args.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+                    new SubSettingLauncher(mContext)
+                            .setDestination(ChannelNotificationSettings.class.getName())
+                            .setArguments(args)
+                            .setTitleRes(R.string.notification_channel_title)
+                            .setResultListener(mHostFragment, 0)
+                            .setSourceMetricsCategory(
+                                    SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP)
+                            .launch();
+                    return true;
                 });
                 channelsBypassingDnd.add(pref);
             }
diff --git a/src/com/android/settings/notification/zen/ZenModeAllBypassingConversationsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAllBypassingConversationsPreferenceController.java
new file mode 100644
index 0000000..309cd42
--- /dev/null
+++ b/src/com/android/settings/notification/zen/ZenModeAllBypassingConversationsPreferenceController.java
@@ -0,0 +1,210 @@
+/*
+ * 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.zen;
+
+import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.text.BidiFormatter;
+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.applications.AppInfoBase;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.ChannelNotificationSettings;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Adds a preference to the PreferenceScreen for each conversation notification channel that can
+ * bypass DND.
+ */
+public class ZenModeAllBypassingConversationsPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
+
+    private final String KEY = "zen_mode_settings_category_conversations";
+
+    @VisibleForTesting ApplicationsState mApplicationsState;
+    @VisibleForTesting PreferenceCategory mCategory;
+    @VisibleForTesting Context mPrefContext;
+
+    private ApplicationsState.Session mAppSession;
+    private NotificationBackend mNotificationBackend = new NotificationBackend();
+    private Fragment mHostFragment;
+
+    public ZenModeAllBypassingConversationsPreferenceController(Context context, Application app,
+            Fragment host) {
+
+        this(context, app == null ? null : ApplicationsState.getInstance(app), host);
+    }
+
+    private ZenModeAllBypassingConversationsPreferenceController(Context context,
+            ApplicationsState appState, Fragment host) {
+        super(context);
+        mApplicationsState = appState;
+        mHostFragment = host;
+
+        if (mApplicationsState != null && host != null) {
+            mAppSession = mApplicationsState.newSession(mAppSessionCallbacks, host.getLifecycle());
+        }
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mCategory = screen.findPreference(KEY);
+        mPrefContext = screen.getContext();
+        updateNotificationChannelList();
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    /**
+     * Call this method to trigger the notification channels list to refresh.
+     */
+    public void updateNotificationChannelList() {
+        if (mAppSession == null) {
+            return;
+        }
+
+        ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED;
+        List<ApplicationsState.AppEntry> apps = mAppSession.rebuild(filter,
+                ApplicationsState.ALPHA_COMPARATOR);
+        if (apps != null) {
+            updateNotificationChannelList(apps);
+        }
+    }
+
+    @VisibleForTesting
+    void updateNotificationChannelList(List<ApplicationsState.AppEntry> apps) {
+        if (mCategory == null || apps == null) {
+            return;
+        }
+
+        List<Preference> channelsBypassingDnd = new ArrayList<>();
+        for (ApplicationsState.AppEntry entry : apps) {
+            String pkg = entry.info.packageName;
+            mApplicationsState.ensureIcon(entry);
+            for (NotificationChannel channel : mNotificationBackend
+                    .getNotificationChannelsBypassingDnd(pkg, entry.info.uid).getList()) {
+                if (TextUtils.isEmpty(channel.getConversationId())) {
+                    // only conversation channels
+                    continue;
+                }
+                Preference pref = new AppPreference(mPrefContext);
+                pref.setKey(pkg + "|" + channel.getId());
+                pref.setTitle(BidiFormatter.getInstance().unicodeWrap(entry.label));
+                // TODO: use badged shortcut icon instead of app icon
+                pref.setIcon(entry.icon);
+                pref.setSummary(BidiFormatter.getInstance().unicodeWrap(channel.getName()));
+
+                pref.setOnPreferenceClickListener(preference -> {
+                    Bundle args = new Bundle();
+                    args.putString(AppInfoBase.ARG_PACKAGE_NAME, entry.info.packageName);
+                    args.putInt(AppInfoBase.ARG_PACKAGE_UID, entry.info.uid);
+                    args.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+                    new SubSettingLauncher(mContext)
+                            .setDestination(ChannelNotificationSettings.class.getName())
+                            .setArguments(args)
+                            .setTitleRes(R.string.notification_channel_title)
+                            .setResultListener(mHostFragment, 0)
+                            .setSourceMetricsCategory(
+                                    SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP)
+                            .launch();
+                    return true;
+                });
+                channelsBypassingDnd.add(pref);
+            }
+
+            mCategory.removeAll();
+            if (channelsBypassingDnd.size() > 0) {
+                mCategory.setVisible(true);
+                for (Preference prefToAdd : channelsBypassingDnd) {
+                    mCategory.addPreference(prefToAdd);
+                }
+            } else {
+                mCategory.setVisible(false);
+            }
+        }
+    }
+
+    private final ApplicationsState.Callbacks mAppSessionCallbacks =
+            new ApplicationsState.Callbacks() {
+
+                @Override
+                public void onRunningStateChanged(boolean running) {
+                    updateNotificationChannelList();
+                }
+
+                @Override
+                public void onPackageListChanged() {
+                    updateNotificationChannelList();
+                }
+
+                @Override
+                public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> apps) {
+                    updateNotificationChannelList(apps);
+                }
+
+                @Override
+                public void onPackageIconChanged() {
+                    updateNotificationChannelList();
+                }
+
+                @Override
+                public void onPackageSizeChanged(String packageName) {
+                    updateNotificationChannelList();
+                }
+
+                @Override
+                public void onAllSizesComputed() { }
+
+                @Override
+                public void onLauncherInfoChanged() {
+                    updateNotificationChannelList();
+                }
+
+                @Override
+                public void onLoadEntriesCompleted() {
+                    // Add shortcut info
+                    updateNotificationChannelList();
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 1f512db..ac49466 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -277,7 +277,7 @@
         } else if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS){
             return R.string.zen_mode_from_none_calls;
         }
-        return 0;
+        return R.string.zen_mode_from_none;
     }
 
     protected int getContactsSummary(int category) {
diff --git a/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
index 5f39449..7b97fb1 100644
--- a/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
@@ -64,4 +64,4 @@
                 preference.setSummary(mSummaryBuilder.getCallsSettingSummary(getPolicy()));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
deleted file mode 100644
index 04e8310..0000000
--- a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
+++ /dev/null
@@ -1,75 +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.notification.zen;
-
-import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SearchIndexable
-public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Indexable {
-
-    @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getSettingsLifecycle());
-    }
-
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Lifecycle lifecycle) {
-        List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new ZenModePriorityMessagesPreferenceController(context, lifecycle));
-        controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
-                PRIORITY_CATEGORY_MESSAGES, "zen_mode_starred_contacts_messages"));
-        controllers.add(new ZenModeBehaviorFooterPreferenceController(
-                context, lifecycle, R.string.zen_mode_messages_footer));
-        return controllers;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.zen_mode_messages_settings;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY;
-    }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_messages_settings) {
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null);
-                }
-            };
-}
diff --git a/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java b/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
new file mode 100644
index 0000000..a06f023
--- /dev/null
+++ b/src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
@@ -0,0 +1,67 @@
+/*
+ * 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.zen;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModePeoplePreferenceController extends
+        AbstractZenModePreferenceController implements PreferenceControllerMixin {
+
+    private final String KEY;
+    private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
+
+    public ZenModePeoplePreferenceController(Context context, Lifecycle lifecycle, String key) {
+        super(context, key, lifecycle);
+        KEY = key;
+        mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                preference.setEnabled(false);
+                preference.setSummary(mBackend.getAlarmsTotalSilenceCallsMessagesSummary(
+                        NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES));
+                break;
+            default:
+                preference.setEnabled(true);
+                // TODO: How do all of the people options roll up into the summary?
+                //preference.setSummary(mSummaryBuilder.getMessagesSettingSummary(getPolicy()));
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
similarity index 60%
rename from src/com/android/settings/notification/zen/ZenModeCallsSettings.java
rename to src/com/android/settings/notification/zen/ZenModePeopleSettings.java
index d2f1c04..af3c26b 100644
--- a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android Open Source Project
+ * 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.
@@ -17,10 +17,16 @@
 package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 
+import android.app.Activity;
+import android.app.Application;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -32,47 +38,60 @@
 import java.util.List;
 
 @SearchIndexable
-public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexable {
+public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexable {
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getSettingsLifecycle());
+        final Activity activity = getActivity();
+        final Application app;
+        if (activity != null) {
+            app = activity.getApplication();
+        } else {
+            app = null;
+        }
+        return buildPreferenceControllers(
+                context, getSettingsLifecycle(), app, this, getFragmentManager());
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Lifecycle lifecycle) {
+            Lifecycle lifecycle, Application app, Fragment host, FragmentManager fragmentManager) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModePriorityMessagesPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
+                PRIORITY_CATEGORY_MESSAGES, "zen_mode_starred_contacts_messages"));
         controllers.add(new ZenModePriorityCallsPreferenceController(context, lifecycle));
         controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
                 PRIORITY_CATEGORY_CALLS, "zen_mode_starred_contacts_callers"));
         controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle,
                 context.getResources().getInteger(com.android.internal.R.integer
-                .config_zen_repeat_callers_threshold)));
-        controllers.add(new ZenModeBehaviorFooterPreferenceController(
-                context, lifecycle, R.string.zen_mode_calls_footer));
+                        .config_zen_repeat_callers_threshold)));
+        controllers.add(
+                new ZenModeAllBypassingConversationsPreferenceController(context, app, host));
+        controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle,
+                fragmentManager));
         return controllers;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.zen_mode_calls_settings;
+        return R.xml.zen_mode_people_settings;
     }
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY;
+        return SettingsEnums.DND_PEOPLE;
     }
 
     /**
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.zen_mode_calls_settings) {
+            new BaseSearchIndexProvider(R.xml.zen_mode_people_settings) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {
-                    return buildPreferenceControllers(context, null);
+                    return buildPreferenceControllers(context, null, null, null, null);
                 }
             };
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
index cdcb558..871974b 100644
--- a/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -78,10 +78,9 @@
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle, FragmentManager fragmentManager) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new ZenModeCallsPreferenceController(context, lifecycle,
-                "zen_mode_behavior_calls"));
-        controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
-                "zen_mode_behavior_messages"));
+        controllers.add(new ZenModePeoplePreferenceController(context, lifecycle,
+                "zen_mode_behavior_people"));
+        controllers.add(new ZenModeBypassingAppsPreferenceController(context, lifecycle));
         controllers.add(new ZenModeBlockedEffectsPreferenceController(context, lifecycle));
         controllers.add(new ZenModeDurationPreferenceController(context, lifecycle));
         controllers.add(new ZenModeAutomationPreferenceController(context));
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index cc30a92..8947f8f 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -246,13 +246,6 @@
         super.onPause();
         if (!isChangingConfigurations()) {
             mGoingToBackground = true;
-            if (mBiometricFragment != null) {
-                Log.d(TAG, "Authenticating: " + mBiometricFragment.isAuthenticating());
-                if (mBiometricFragment.isAuthenticating()) {
-                    mBiometricFragment.cancel();
-                }
-            }
-
             finish();
         } else {
             mGoingToBackground = false;
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 8098b80..29b114a 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -57,6 +57,9 @@
     @VisibleForTesting
     static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE =
             "security_setting_lock_screen_notif_work";
+    @VisibleForTesting
+    static final String KEY_ADD_USER_FROM_LOCK_SCREEN =
+            "security_lockscreen_add_users_when_locked";
 
 
     private AmbientDisplayConfiguration mConfig;
@@ -139,6 +142,13 @@
                 }
 
                 @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> niks = super.getNonIndexableKeys(context);
+                    niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);
+                    return niks;
+                }
+
+                @Override
                 protected boolean isPageSearchEnabled(Context context) {
                     return new LockScreenPreferenceController(context, "anykey")
                             .isAvailable();
diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java
index 3b23daa..ffc1d6b 100644
--- a/src/com/android/settings/security/SimLockPreferenceController.java
+++ b/src/com/android/settings/security/SimLockPreferenceController.java
@@ -77,7 +77,7 @@
      */
     private boolean isSimReady() {
         final List<SubscriptionInfo> subInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList(true);
+                mSubscriptionManager.getActiveSubscriptionInfoList();
         if (subInfoList != null) {
             for (SubscriptionInfo subInfo : subInfoList) {
                 final int simState = mTelephonyManager.getSimState(subInfo.getSimSlotIndex());
@@ -95,7 +95,7 @@
      */
     private boolean isSimIccReady() {
         final List<SubscriptionInfo> subInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList(true);
+                mSubscriptionManager.getActiveSubscriptionInfoList();
 
         if (subInfoList != null) {
             for (SubscriptionInfo subInfo : subInfoList) {
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index e7d7ea3..b1dfd14 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -33,17 +33,11 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.applications.DefaultAppInfo;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Settings picker screen to handle Web implementation
- */
-@SearchIndexable
 public class WebViewAppPicker extends DefaultAppPickerFragment {
     private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
 
@@ -170,7 +164,4 @@
         }
         return null;
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.webview_app_settings);
 }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e228a14..a8b3250 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -142,7 +142,6 @@
     @VisibleForTesting
     int mAccessPointSecurity;
     private TextView mPasswordView;
-    private TextView mSaePasswordIdView;
     private ImageButton mSsidScanButton;
 
     private String mUnspecifiedCertString;
@@ -811,11 +810,6 @@
                     String password = mPasswordView.getText().toString();
                     config.preSharedKey = '"' + password + '"';
                 }
-                if (mSaePasswordIdView.length() != 0) {
-                    config.saePasswordId = mSaePasswordIdView.getText().toString();
-                } else {
-                    config.saePasswordId = null;
-                }
                 break;
 
             case AccessPoint.SECURITY_OWE:
@@ -1002,23 +996,6 @@
             }
         }
 
-        if (mSaePasswordIdView == null) {
-            mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
-            mSaePasswordIdView.setOnEditorActionListener(this);
-            mSaePasswordIdView.setOnKeyListener(this);
-        }
-
-        if (mAccessPointSecurity == AccessPoint.SECURITY_SAE) {
-            mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
-            if (mAccessPoint != null && mAccessPoint.isSaved()) {
-                if (!TextUtils.isEmpty(mAccessPoint.getConfig().saePasswordId)) {
-                    mSaePasswordIdView.setText(mAccessPoint.getConfig().saePasswordId);
-                }
-            }
-        } else {
-            setSaePasswordIdInvisible();
-        }
-
         if (mAccessPointSecurity != AccessPoint.SECURITY_EAP &&
                 mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
             mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1326,11 +1303,6 @@
         mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
     }
 
-    private void setSaePasswordIdInvisible() {
-        mSaePasswordIdView.setText("");
-        mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
-    }
-
     private void setEapMethodInvisible() {
         mView.findViewById(R.id.eap).setVisibility(View.GONE);
     }
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 90f1397..ecf20fd 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -142,7 +142,6 @@
     @VisibleForTesting
     int mWifiEntrySecurity;
     private TextView mPasswordView;
-    private TextView mSaePasswordIdView;
     private ImageButton mSsidScanButton;
 
     private String mUnspecifiedCertString;
@@ -805,11 +804,6 @@
                     String password = mPasswordView.getText().toString();
                     config.preSharedKey = '"' + password + '"';
                 }
-                if (mSaePasswordIdView.length() != 0) {
-                    config.saePasswordId = mSaePasswordIdView.getText().toString();
-                } else {
-                    config.saePasswordId = null;
-                }
                 break;
 
             case WifiEntry.SECURITY_OWE:
@@ -996,23 +990,6 @@
             }
         }
 
-        if (mSaePasswordIdView == null) {
-            mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
-            mSaePasswordIdView.setOnEditorActionListener(this);
-            mSaePasswordIdView.setOnKeyListener(this);
-        }
-
-        if (mWifiEntrySecurity == WifiEntry.SECURITY_SAE) {
-            mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
-            if (mWifiEntry != null && mWifiEntry.isSaved()) {
-                if (!TextUtils.isEmpty(mWifiEntry.getWifiConfiguration().saePasswordId)) {
-                    mSaePasswordIdView.setText(mWifiEntry.getWifiConfiguration().saePasswordId);
-                }
-            }
-        } else {
-            setSaePasswordIdInvisible();
-        }
-
         if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP
                 && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
             mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1322,11 +1299,6 @@
         mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
     }
 
-    private void setSaePasswordIdInvisible() {
-        mSaePasswordIdView.setText("");
-        mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
-    }
-
     private void setEapMethodInvisible() {
         mView.findViewById(R.id.eap).setVisibility(View.GONE);
     }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 27b5c3b..488aadb 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -227,7 +227,12 @@
         super.onCreate(icicle);
 
         if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            getContext().startActivity(new Intent("android.settings.WIFI_SETTINGS2"));
+            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;
         }
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index a1f1ad9..c48e739 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -326,18 +326,6 @@
         if (savedInstanceState != null) {
             mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
             mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
-
-            if (!TextUtils.isEmpty(mDialogWifiEntryKey)) {
-                List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
-                Optional<WifiEntry> matchedWifiEntry = wifiEntries.stream().filter(wifiEntry ->
-                        TextUtils.equals(wifiEntry.getKey(), mDialogWifiEntryKey)).findAny();
-                if (matchedWifiEntry.isPresent()) {
-                    mDialogWifiEntry = matchedWifiEntry.get();
-                } else {
-                    throw new IllegalStateException("Failed to restore WifiEntry of key: "
-                            + mDialogWifiEntryKey);
-                }
-            }
         }
 
         // If we're supposed to enable/disable the Next button based on our current connection
@@ -405,21 +393,6 @@
         }
 
         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
@@ -564,6 +537,15 @@
         if (preference instanceof LongPressWifiEntryPreference) {
             final WifiEntry selectedEntry =
                     ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+            if (selectedEntry.isSaved()) {
+                if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
+                        .getHasEverConnected()) {
+                    launchConfigNewNetworkFragment(selectedEntry);
+                    return true;
+                }
+            }
+
             connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
         } else if (preference == mAddWifiNetworkPreference) {
             onAddNetworkPressed();
@@ -673,6 +655,21 @@
     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
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
index 79d5002..f276603 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
@@ -74,8 +74,8 @@
     void showAddNetworksFragment() {
         // TODO: Check the new intent status.
         mBundle.putString(KEY_CALLING_PACKAGE_NAME, getCallingPackage());
-        mBundle.putParcelableArrayList(Settings.EXTRA_WIFI_CONFIGURATION_LIST,
-                getIntent().getParcelableArrayListExtra(Settings.EXTRA_WIFI_CONFIGURATION_LIST));
+        mBundle.putParcelableArrayList(Settings.EXTRA_WIFI_NETWORK_LIST,
+                getIntent().getParcelableArrayListExtra(Settings.EXTRA_WIFI_NETWORK_LIST));
 
         final FragmentManager fragmentManager = getSupportFragmentManager();
         Fragment fragment = fragmentManager.findFragmentByTag(TAG);
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index c925e7b..fb8d85e 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -27,6 +27,8 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiNetworkSuggestion;
+import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -65,8 +67,7 @@
     // Possible result values in each item of the returned result list, which is used
     // to inform the caller APP the processed result of each specified network.
     @VisibleForTesting
-    static final int RESULT_NETWORK_INITIAL = -1;  //initial value
-    private static final int RESULT_NETWORK_SUCCESS = 0;
+    static final int RESULT_NETWORK_SUCCESS = 0;
     private static final int RESULT_NETWORK_ADD_ERROR = 1;
     @VisibleForTesting
     static final int RESULT_NETWORK_ALREADY_EXISTS = 2;
@@ -97,7 +98,7 @@
     @VisibleForTesting
     String mCallingPackageName;
     @VisibleForTesting
-    List<WifiConfiguration> mAllSpecifiedNetworksList;
+    List<WifiNetworkSuggestion> mAllSpecifiedNetworksList;
     @VisibleForTesting
     List<UiConfigurationItem> mUiToRequestedList;
     @VisibleForTesting
@@ -121,7 +122,8 @@
                 case MESSAGE_START_SAVING_NETWORK:
                     mSaveButton.setEnabled(false);
                     // Save the proposed networks, start from first one.
-                    saveNetwork(0);
+                    mSavingIndex = 0;
+                    saveNetwork(mSavingIndex);
                     break;
 
                 case MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK:
@@ -192,7 +194,7 @@
         }
 
         mAllSpecifiedNetworksList =
-                bundle.getParcelableArrayList(Settings.EXTRA_WIFI_CONFIGURATION_LIST);
+                bundle.getParcelableArrayList(Settings.EXTRA_WIFI_NETWORK_LIST);
 
         // If there is no network in the request intent or the requested networks exceed the
         // maximum limit, then just finish activity.
@@ -224,7 +226,7 @@
             setSingleNetworkSignalIcon();
             // Show the SSID of the proposed network.
             ((TextView) mLayoutView.findViewById(R.id.single_ssid)).setText(
-                    mAllSpecifiedNetworksList.get(0).SSID);
+                    mUiToRequestedList.get(0).mDisplayedSsid);
             // Set the status view as gone when UI is initialized.
             mSingleNetworkProcessingStatusView.setVisibility(View.GONE);
         } else {
@@ -259,7 +261,7 @@
         mResultCodeArrayList = new ArrayList<>();
 
         for (int i = 0; i < networksSize; i++) {
-            mResultCodeArrayList.add(RESULT_NETWORK_INITIAL);
+            mResultCodeArrayList.add(RESULT_NETWORK_SUCCESS);
         }
     }
 
@@ -268,6 +270,53 @@
                 ? config.wepKeys[config.wepTxKeyIndex] : null;
     }
 
+    private boolean isSavedPasspointConfiguration(
+            PasspointConfiguration specifiecPassPointConfiguration) {
+        return mWifiManager.getPasspointConfigurations().stream()
+                .filter(config -> config.equals(specifiecPassPointConfiguration))
+                .findFirst()
+                .isPresent();
+    }
+
+    private boolean isSavedWifiConfiguration(WifiConfiguration specifiedConfig,
+            List<WifiConfiguration> savedWifiConfigurations) {
+        final String ssidWithQuotation = addQuotationIfNeeded(specifiedConfig.SSID);
+        final int authType = specifiedConfig.getAuthType();
+        // TODO: reformat to use lambda
+        for (WifiConfiguration privilegedWifiConfiguration : savedWifiConfigurations) {
+            // If SSID or security type is different, should be new network or need to be
+            // updated network, continue to check others.
+            if (!ssidWithQuotation.equals(privilegedWifiConfiguration.SSID)
+                    || authType != privilegedWifiConfiguration.getAuthType()) {
+                continue;
+            }
+
+            //  If specified network and saved network have same security types, we'll check
+            //  more information according to their security type to judge if they are same.
+            switch (authType) {
+                case KeyMgmt.NONE:
+                    final String wep = getWepKey(specifiedConfig);
+                    final String savedWep = getWepKey(privilegedWifiConfiguration);
+                    return TextUtils.equals(wep, savedWep);
+                case KeyMgmt.OWE:
+                    return true;
+                case KeyMgmt.WPA_PSK:
+                case KeyMgmt.WPA2_PSK:
+                case KeyMgmt.SAE:
+                    if (specifiedConfig.preSharedKey.equals(
+                            privilegedWifiConfiguration.preSharedKey)) {
+                        return true;
+                    }
+                    break;
+                // TODO: Check how to judge enterprise type.
+                default:
+                    break;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * For the APP specified networks, filter saved ones and mark those saved as existed. And
      * prepare a new UiConfigurationItem list, which contains those new or need to be updated
@@ -283,54 +332,42 @@
         }
 
         boolean foundInSavedList;
+        boolean foundError;
+        String displayedName = null;
         int networkPositionInBundle = 0;
-        for (WifiConfiguration specifiedConfig : mAllSpecifiedNetworksList) {
+        for (WifiNetworkSuggestion suggestion : mAllSpecifiedNetworksList) {
             foundInSavedList = false;
-            final String displayedSsid = removeDoubleQuotes(specifiedConfig.SSID);
-            final String ssidWithQuotation = addQuotationIfNeeded(specifiedConfig.SSID);
-            final int authType = specifiedConfig.getAuthType();
+            foundError = false;
 
-            for (WifiConfiguration privilegedWifiConfiguration : savedWifiConfigurations) {
-                // If SSID or security type is different, should be new network or need to be
-                // updated network.
-                if (!ssidWithQuotation.equals(privilegedWifiConfiguration.SSID)
-                        || authType != privilegedWifiConfiguration.getAuthType()) {
-                    continue;
+            /**
+             * If specified is passpoint network, need to check with the existing passpoint
+             * networks.
+             */
+            if (suggestion.passpointConfiguration != null) {
+                if (!suggestion.passpointConfiguration.validate()) {
+                    foundError = true;
+                } else {
+                    foundInSavedList = isSavedPasspointConfiguration(
+                            suggestion.passpointConfiguration);
+                    displayedName = suggestion.passpointConfiguration.getHomeSp().getFriendlyName();
                 }
-
-                //  If specified network and saved network have same security types, we'll check
-                //  more information according to their security type to judge if they are same.
-                switch (authType) {
-                    case KeyMgmt.NONE:
-                        final String wep = getWepKey(specifiedConfig);
-                        final String savedWep = getWepKey(privilegedWifiConfiguration);
-                        foundInSavedList = TextUtils.equals(wep, savedWep);
-                        break;
-                    case KeyMgmt.OWE:
-                        foundInSavedList = true;
-                        break;
-                    case KeyMgmt.WPA_PSK:
-                    case KeyMgmt.WPA2_PSK:
-                    case KeyMgmt.SAE:
-                        if (specifiedConfig.preSharedKey.equals(
-                                privilegedWifiConfiguration.preSharedKey)) {
-                            foundInSavedList = true;
-                        }
-                        break;
-                    // TODO: Check how to judge enterprise type.
-                    default:
-                        break;
-                }
+            } else {
+                final WifiConfiguration specifiedConfig = suggestion.wifiConfiguration;
+                displayedName = removeDoubleQuotes(specifiedConfig.SSID);
+                foundInSavedList = isSavedWifiConfiguration(specifiedConfig,
+                        savedWifiConfigurations);
             }
 
-            if (foundInSavedList) {
+            if (foundError) {
+                mResultCodeArrayList.set(networkPositionInBundle, RESULT_NETWORK_ADD_ERROR);
+            } else if (foundInSavedList) {
                 // If this requested network already in the saved networks, mark this item in the
                 // result code list as existed.
                 mResultCodeArrayList.set(networkPositionInBundle, RESULT_NETWORK_ALREADY_EXISTS);
             } else {
                 // Prepare to add to UI list to show to user
-                UiConfigurationItem uiConfigurationIcon = new UiConfigurationItem(displayedSsid,
-                        specifiedConfig, networkPositionInBundle);
+                UiConfigurationItem uiConfigurationIcon = new UiConfigurationItem(displayedName,
+                        suggestion, networkPositionInBundle);
                 mUiToRequestedList.add(uiConfigurationIcon);
             }
             networkPositionInBundle++;
@@ -433,12 +470,13 @@
     @VisibleForTesting
     static class UiConfigurationItem {
         public final String mDisplayedSsid;
-        public final WifiConfiguration mWifiConfiguration;
+        public final WifiNetworkSuggestion mWifiNetworkSuggestion;
         public final int mIndex;
 
-        UiConfigurationItem(String displayedSsid, WifiConfiguration wifiConfiguration, int index) {
+        UiConfigurationItem(String displayedSsid, WifiNetworkSuggestion wifiNetworkSuggestion,
+                int index) {
             mDisplayedSsid = displayedSsid;
-            mWifiConfiguration = wifiConfiguration;
+            mWifiNetworkSuggestion = wifiNetworkSuggestion;
             mIndex = index;
         }
     }
@@ -497,9 +535,6 @@
         mSaveListener = new WifiManager.ActionListener() {
             @Override
             public void onSuccess() {
-                // Set success into result list.
-                mResultCodeArrayList.set(mUiToRequestedList.get(mSavingIndex).mIndex,
-                        RESULT_NETWORK_SUCCESS);
                 mAnyNetworkSavedSuccess = true;
 
                 if (saveNextNetwork()) {
@@ -561,16 +596,34 @@
      * Call framework API to save single network.
      */
     private void saveNetwork(int index) {
-        final WifiConfiguration wifiConfiguration = mUiToRequestedList.get(
-                index).mWifiConfiguration;
-        wifiConfiguration.SSID = addQuotationIfNeeded(wifiConfiguration.SSID);
-        mSavingIndex = index;
-        mWifiManager.save(wifiConfiguration, mSaveListener);
+        if (mUiToRequestedList.get(index).mWifiNetworkSuggestion.passpointConfiguration != null) {
+            // Save passpoint, if no IllegalArgumentException, then treat it as success.
+            try {
+                mWifiManager.addOrUpdatePasspointConfiguration(mUiToRequestedList.get(
+                        index).mWifiNetworkSuggestion.passpointConfiguration);
+                mAnyNetworkSavedSuccess = true;
+            } catch (IllegalArgumentException e) {
+                mResultCodeArrayList.set(mUiToRequestedList.get(index).mIndex,
+                        RESULT_NETWORK_ADD_ERROR);
+            }
+
+            if (saveNextNetwork()) {
+                return;
+            }
+            // Show saved or failed according to all results.
+            showSavedOrFail();
+            return;
+        } else {
+            final WifiConfiguration wifiConfiguration = mUiToRequestedList.get(
+                    index).mWifiNetworkSuggestion.wifiConfiguration;
+            wifiConfiguration.SSID = addQuotationIfNeeded(wifiConfiguration.SSID);
+            mWifiManager.save(wifiConfiguration, mSaveListener);
+        }
     }
 
     private void connectNetwork(int index) {
         final WifiConfiguration wifiConfiguration = mUiToRequestedList.get(
-                index).mWifiConfiguration;
+                index).mWifiNetworkSuggestion.wifiConfiguration;
         mWifiManager.connect(wifiConfiguration, null /* ActionListener */);
     }
 
@@ -581,7 +634,7 @@
 
         if (resultArrayList != null) {
             Intent intent = new Intent();
-            intent.putIntegerArrayListExtra(Settings.EXTRA_WIFI_CONFIGURATION_RESULT_LIST,
+            intent.putIntegerArrayListExtra(Settings.EXTRA_WIFI_NETWORK_RESULT_LIST,
                     (ArrayList<Integer>) resultArrayList);
             mActivity.setResult(resultCode, intent);
         }
diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 82c6ce4..17475df 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -41,6 +41,8 @@
 
 import com.android.settings.R;
 
+import com.google.android.setupcompat.template.FooterButton;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -88,8 +90,8 @@
                 Log.d(TAG, sb.toString());
             }
 
-            showErrorUi(code, ssid, channelListArray, operatingClassArray,
-                    /* isConfigurationChange */ false);
+            showErrorUi(code, getResultIntent(code, ssid, channelListArray,
+                    operatingClassArray), /* isConfigurationChange */ false);
         }
 
         @Override
@@ -120,8 +122,53 @@
         }
     }
 
-    private void showErrorUi(int code, String ssid, SparseArray<int[]> channelListArray,
-            int[] operatingClassArray, boolean isConfigurationChange) {
+    private Intent getResultIntent(int code, String ssid, SparseArray<int[]> channelListArray,
+            int[] operatingClassArray) {
+        Intent intent = new Intent();
+        intent.putExtra(EXTRA_EASY_CONNECT_ERROR_CODE, code);
+
+        if (!TextUtils.isEmpty(ssid)) {
+            intent.putExtra(EXTRA_EASY_CONNECT_ATTEMPTED_SSID, ssid);
+        }
+        if (channelListArray != null && channelListArray.size() != 0) {
+            int key;
+            int index = 0;
+            JSONObject formattedChannelList = new JSONObject();
+
+            // Build a JSON array of operating classes, with an array of channels for each
+            // operating class.
+            do {
+                try {
+                    key = channelListArray.keyAt(index);
+                } catch (java.lang.ArrayIndexOutOfBoundsException e) {
+                    break;
+                }
+                JSONArray channelsInClassArray = new JSONArray();
+
+                int[] output = channelListArray.get(key);
+                for (int i = 0; i < output.length; i++) {
+                    channelsInClassArray.put(output[i]);
+                }
+                try {
+                    formattedChannelList.put(Integer.toString(key), channelsInClassArray);
+                } catch (org.json.JSONException e) {
+                    formattedChannelList = new JSONObject();
+                    break;
+                }
+                index++;
+            } while (true);
+
+            intent.putExtra(EXTRA_EASY_CONNECT_CHANNEL_LIST,
+                    formattedChannelList.toString());
+        }
+        if (operatingClassArray != null && operatingClassArray.length != 0) {
+            intent.putExtra(EXTRA_EASY_CONNECT_BAND_LIST, operatingClassArray);
+        }
+
+        return intent;
+    }
+
+    private void showErrorUi(int code, Intent resultIntent, boolean isConfigurationChange) {
         CharSequence summaryCharSequence;
         switch (code) {
             case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
@@ -198,56 +245,18 @@
         mSummary.setText(summaryCharSequence);
         mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_error);
         mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
+        FooterButton finishingButton = mLeftButton;
         if (hasRetryButton(code)) {
             mRightButton.setText(getContext(), R.string.retry);
         } else {
             mRightButton.setText(getContext(), R.string.done);
-            mRightButton.setOnClickListener(v -> {
-                final Activity activity = getActivity();
-                final Intent intent = activity.getIntent();
-                intent.putExtra(EXTRA_EASY_CONNECT_ERROR_CODE, code);
-
-                if (!TextUtils.isEmpty(ssid)) {
-                    intent.putExtra(EXTRA_EASY_CONNECT_ATTEMPTED_SSID, ssid);
-                }
-                if (channelListArray != null && channelListArray.size() != 0) {
-                    int key;
-                    int index = 0;
-                    JSONObject formattedChannelList = new JSONObject();
-
-                    // Build a JSON array of operating classes, with an array of channels for each
-                    // operating class.
-                    do {
-                        try {
-                            key = channelListArray.keyAt(index);
-                        } catch (java.lang.ArrayIndexOutOfBoundsException e) {
-                            break;
-                        }
-                        JSONArray channelsInClassArray = new JSONArray();
-
-                        int[] output = channelListArray.get(key);
-                        for (int i = 0; i < output.length; i++) {
-                            channelsInClassArray.put(output[i]);
-                        }
-                        try {
-                            formattedChannelList.put(Integer.toString(key), channelsInClassArray);
-                        } catch (org.json.JSONException e) {
-                            formattedChannelList = new JSONObject();
-                            break;
-                        }
-                        index++;
-                    } while (true);
-
-                    intent.putExtra(EXTRA_EASY_CONNECT_CHANNEL_LIST,
-                            formattedChannelList.toString());
-                }
-                if (operatingClassArray != null && operatingClassArray.length != 0) {
-                    intent.putExtra(EXTRA_EASY_CONNECT_BAND_LIST, operatingClassArray);
-                }
-                activity.finish();
-            });
+            finishingButton = mRightButton;
             mLeftButton.setVisibility(View.INVISIBLE);
         }
+        finishingButton.setOnClickListener(v -> {
+            getActivity().setResult(Activity.RESULT_CANCELED, resultIntent);
+            getActivity().finish();
+        });
 
         if (isEasyConnectHandshaking()) {
             mSummary.setText(R.string.wifi_dpp_sharing_wifi_with_this_device);
@@ -356,8 +365,8 @@
                 mRightButton.setVisibility(isEasyConnectHandshaking() ?
                         View.INVISIBLE : View.VISIBLE);
             } else {
-                showErrorUi(mLatestStatusCode, /*ssid */null, /* channelListArray */
-                        null, /* operatingClassArray */ null, /* isConfigurationChange */ true);
+                showErrorUi(mLatestStatusCode, /* reslutIntent */ null, /* isConfigurationChange */
+                        true);
             }
         }
     }
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index cb72a6d..b19e3b8 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -78,6 +78,16 @@
     /** The Wi-Fi DPP QR code from intent ACTION_PROCESS_WIFI_EASY_CONNECT_URI */
     private WifiQrCode mWifiDppQrCode;
 
+    /**
+     * The remote device's band support obtained as an (optional) extra
+     * EXTRA_EASY_CONNECT_BAND_LIST from the intent ACTION_PROCESS_WIFI_EASY_CONNECT_URI.
+     *
+     * The band support is provided as IEEE 802.11 Global Operating Classes. There may be a single
+     * or multiple operating classes specified. The array may also be a null if the extra wasn't
+     * specified.
+     */
+    private int[] mWifiDppRemoteBandSupport;
+
     /** Secret extra that allows fake networks to show in UI for testing purposes */
     private boolean mIsTest;
 
@@ -141,9 +151,16 @@
                 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
                 final boolean isDppSupported = WifiDppUtils.isWifiDppEnabled(this);
                 if (!isDppSupported) {
-                    Log.d(TAG, "Device doesn't support Wifi DPP");
+                    Log.e(TAG,
+                            "ACTION_PROCESS_WIFI_EASY_CONNECT_URI for a device that doesn't "
+                                    + "support Wifi DPP - use WifiManager#isEasyConnectSupported");
+                }
+                if (mWifiDppQrCode == null) {
+                    Log.e(TAG, "ACTION_PROCESS_WIFI_EASY_CONNECT_URI with null URI!");
                 }
                 if (mWifiDppQrCode == null || !isDppSupported) {
                     cancelActivity = true;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 8862830..93a3530 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -349,7 +349,7 @@
         // When the value of this key is read, the actual key is not returned, just a "*".
         // Call privileged system API to obtain actual key.
         final String preSharedKey = removeFirstAndLastDoubleQuotes(
-                softApConfiguration.getWpa2Passphrase());
+                softApConfiguration.getPassphrase());
 
         if (!TextUtils.isEmpty(ssid)) {
             intent.putExtra(EXTRA_WIFI_SSID, ssid);
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index f965e20..8544a53 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -56,17 +56,14 @@
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
+/*
  * Displays Wi-fi p2p settings UI
  */
-@SearchIndexable
 public class WifiP2pSettings extends DashboardFragment
         implements PersistentGroupInfoListener, PeerListListener, DeviceInfoListener {
 
@@ -634,7 +631,4 @@
             });
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.wifi_p2p_settings);
 }
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
index ab2aada..863e87a 100644
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
@@ -27,17 +27,14 @@
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
 
 /**
  * UI to manage saved networks/access points.
  */
-@SearchIndexable
 public class SavedAccessPointsWifiSettings extends DashboardFragment {
 
     private static final String TAG = "SavedAccessPoints";
@@ -133,7 +130,4 @@
             outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
         }
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.wifi_display_saved_access_points);
 }
diff --git a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index 16bb2cc..0145bb4 100644
--- a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -37,10 +37,8 @@
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
-import com.android.settingslib.search.SearchIndexable;
 import com.android.wifitrackerlib.SavedNetworkTracker;
 
 import java.time.Clock;
@@ -49,7 +47,6 @@
 /**
  * UI to manage saved networks/access points.
  */
-@SearchIndexable
 public class SavedAccessPointsWifiSettings2 extends DashboardFragment
         implements SavedNetworkTracker.SavedNetworkTrackerCallback {
 
@@ -167,7 +164,4 @@
         use(SubscribedAccessPointsPreferenceController2.class)
                 .displayPreference(screen, mSavedNetworkTracker.getSubscriptionWifiEntries());
     }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.wifi_display_saved_access_points2);
 }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index 690e283..1563e61 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -51,10 +51,10 @@
         final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
         if (config == null
                 || (config.getSecurityType() == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
-                && TextUtils.isEmpty(config.getWpa2Passphrase()))) {
+                && TextUtils.isEmpty(config.getPassphrase()))) {
             mPassword = generateRandomPassword();
         } else {
-            mPassword = config.getWpa2Passphrase();
+            mPassword = config.getPassphrase();
         }
         ((ValidatedEditTextPreference) mPreference).setValidator(this);
         ((ValidatedEditTextPreference) mPreference).setIsPassword(true);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 8b2f05c..3c4a001 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -214,8 +214,9 @@
         final int securityType = mSecurityPreferenceController.getSecurityType();
         configBuilder.setSsid(mSSIDPreferenceController.getSSID());
         if (securityType == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK) {
-            configBuilder.setWpa2Passphrase(
-                    mPasswordPreferenceController.getPasswordValidated(securityType));
+            configBuilder.setPassphrase(
+                    mPasswordPreferenceController.getPasswordValidated(securityType),
+                    SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
         }
         configBuilder.setBand(mApBandPreferenceController.getBandIndex());
         return configBuilder.build();
diff --git a/tests/robotests/assets/grandfather_fragment_not_searchable b/tests/robotests/assets/grandfather_fragment_not_searchable
deleted file mode 100644
index 7488d5f..0000000
--- a/tests/robotests/assets/grandfather_fragment_not_searchable
+++ /dev/null
@@ -1,20 +0,0 @@
-com.android.settings.backup.ToggleBackupSettingFragment
-com.android.settings.applications.RunningServices
-com.android.settings.applications.ConvertToFbe
-com.android.settings.applications.appops.BackgroundCheckSummary
-com.android.settings.fuelgauge.InactiveApps
-com.android.settings.ResetNetwork
-com.android.settings.MasterClear
-com.android.settings.applications.manageapplications.ManageApplications
-com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
-com.android.settings.vpn2.VpnSettings
-com.android.settings.security.CryptKeeperSettings
-com.android.settings.TrustedCredentialsSettings
-com.android.settings.UserCredentialsSettings
-com.android.settings.applications.defaultapps.DefaultAutofillPicker
-com.android.phone.NetworkSelectSetting
-com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
-com.android.settings.nfc.AndroidBeam
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 8aa1288..80e179a 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -17,6 +17,7 @@
 com.android.settings.applications.AppStorageSettings
 com.android.settings.applications.ConfirmConvertToFbe
 com.android.settings.applications.ProcessStatsDetail
+com.android.settings.applications.ProcessStatsSummary
 com.android.settings.applications.ProcessStatsUi
 com.android.settings.applications.RunningServices
 com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails
@@ -25,6 +26,7 @@
 com.android.settings.backup.ToggleBackupSettingFragment
 com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
 com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
+com.android.settings.bluetooth.BluetoothPairingDetail
 com.android.settings.bluetooth.DevicePickerFragment
 com.android.settings.dashboard.profileselector.ProfileSelectAccountFragment
 com.android.settings.dashboard.profileselector.ProfileSelectManageApplications
@@ -32,19 +34,24 @@
 com.android.settings.datausage.AppDataUsage
 com.android.settings.datausage.DataUsageList
 com.android.settings.datausage.DataUsageSummary
+com.android.settings.datetime.timezone.TimeZoneSettings
+com.android.settings.development.compat.PlatformCompatDashboard
 com.android.settings.deviceinfo.PrivateVolumeSettings
 com.android.settings.deviceinfo.PublicVolumeSettings
 com.android.settings.deviceinfo.StorageProfileFragment
+com.android.settings.deviceinfo.legal.ModuleLicensesDashboard
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
 com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
+com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
 com.android.settings.fuelgauge.InactiveApps
 com.android.settings.fuelgauge.RestrictedAppDetails
 com.android.settings.IccLockSettings
 com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
 com.android.settings.inputmethod.KeyboardLayoutPickerFragment
+com.android.settings.inputmethod.SpellCheckersSettings
 com.android.settings.location.LocationPersonalSettings
 com.android.settings.location.LocationWorkProfileSettings
 com.android.settings.network.ApnEditor
@@ -81,7 +88,10 @@
 com.android.settings.wifi.calling.WifiCallingSettingsForSub
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
 com.android.settings.wifi.dpp.WifiNetworkListFragment
+com.android.settings.wifi.p2p.WifiP2pSettings
+com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings
 com.android.settings.wifi.WifiInfo
 com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails
 com.android.settings.wifi.details2.WifiNetworkDetailsFragment2
+com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2
 com.android.settings.dashboard.profileselector.ProfileSelectRecentLocationRequestFragment
diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
new file mode 100644
index 0000000..51c856a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.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;
+
+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.net.ConnectivityManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.testutils.shadow.ShadowWifiManager;
+import com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceController;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowWifiManager.class})
+public class AllInOneTetherSettingsTest {
+    private static final String[] WIFI_REGEXS = {"wifi_regexs"};
+
+    private Context mContext;
+    private AllInOneTetherSettings mAllInOneTetherSettings;
+
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private UserManager mUserManager;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+
+        MockitoAnnotations.initMocks(this);
+        doReturn(mConnectivityManager)
+                .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
+        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+
+        mAllInOneTetherSettings = new AllInOneTetherSettings();
+    }
+
+    @Test
+    public void getNonIndexableKeys_tetherAvailable_keysNotReturned() {
+        // To let TetherUtil.isTetherAvailable return true, select one of the combinations
+        setupIsTetherAvailable(true);
+
+        final List<String> niks =
+                AllInOneTetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
+        assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
+        assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
+        assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+        assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_TETHER_PREFS_SCREEN);
+    }
+
+    @Test
+    public void getNonIndexableKeys_tetherNotAvailable_keysReturned() {
+        // To let TetherUtil.isTetherAvailable return false, select one of the combinations
+        setupIsTetherAvailable(false);
+
+        final List<String> niks =
+                AllInOneTetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_TETHER_PREFS_SCREEN);
+    }
+
+    @Test
+    public void getPreferenceControllers_notEmpty() {
+        assertThat(AllInOneTetherSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getPreferenceControllers(mContext)).isNotEmpty();
+    }
+
+    @Test
+    public void createPreferenceControllers_hasAutoOffPreference() {
+        assertThat(mAllInOneTetherSettings.createPreferenceControllers(mContext)
+                .stream()
+                .filter(controller -> controller instanceof WifiTetherAutoOffPreferenceController)
+                .count())
+                .isEqualTo(1);
+    }
+
+    private void setupIsTetherAvailable(boolean returnValue) {
+        when(mConnectivityManager.isTetheringSupported()).thenReturn(true);
+
+        // For RestrictedLockUtils.checkIfRestrictionEnforced
+        final int userId = UserHandle.myUserId();
+        List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
+        when(mUserManager.getUserRestrictionSources(
+                UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.of(userId)))
+                .thenReturn(enforcingUsers);
+
+        // For RestrictedLockUtils.hasBaseUserRestriction
+        when(mUserManager.hasBaseUserRestriction(
+                UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.of(userId)))
+                .thenReturn(!returnValue);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index d2b4733..feb48ab 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -30,13 +30,11 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
-import android.util.FeatureFlagUtils;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.OnActivityResultListener;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -45,6 +43,7 @@
 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;
 
@@ -66,9 +65,7 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
-        mActivity = spy(new SettingsActivity());
-        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE, false);
-
+        mActivity = spy(Robolectric.buildActivity(SettingsActivity.class).create().get());
     }
 
     @Test
@@ -76,7 +73,6 @@
         when(mActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
         doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
         when(mFragmentManager.beginTransaction()).thenReturn(mock(FragmentTransaction.class));
-
         doReturn(RuntimeEnvironment.application.getClassLoader()).when(mActivity).getClassLoader();
 
         mActivity.launchSettingFragment(null, mock(Intent.class));
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index 89ad812..655e7b6 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -28,7 +28,7 @@
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.PreferredShortcutType;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,6 +53,8 @@
             DUMMY_CLASS_NAME2);
     private static final String SOFTWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT;
+    private static final String HARDWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
 
     private Context mContext;
 
@@ -133,17 +135,53 @@
     }
 
     @Test
-    public void hasValueInSettings_dummyComponentName_hasValue() {
+    public void hasValueInSettings_putValue_hasValue() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
 
-        assertThat(AccessibilityUtil.hasValueInSettings(mContext, PreferredShortcutType.SOFTWARE,
+        assertThat(AccessibilityUtil.hasValueInSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME)).isTrue();
     }
 
     @Test
-    public void optInValueToSettings_optInDummyComponentName2_haveDummyComponentName2String() {
+    public void getUserShortcutTypeFromSettings_putOneValue_hasValue() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
-        AccessibilityUtil.optInValueToSettings(mContext, PreferredShortcutType.SOFTWARE,
+
+        final int shortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
+                DUMMY_COMPONENT_NAME);
+        assertThat(
+                (shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE).isTrue();
+    }
+
+    @Test
+    public void getUserShortcutTypeFromSettings_putTwoValues_hasValue() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+
+        final int shortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
+                DUMMY_COMPONENT_NAME);
+        assertThat(
+                (shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE).isTrue();
+        assertThat(
+                (shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE).isTrue();
+    }
+
+    @Test
+    public void optInAllValuesToSettings_optInValue_haveMatchString() {
+        int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
+
+        AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, DUMMY_COMPONENT_NAME);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
+                DUMMY_COMPONENT_NAME.flattenToString());
+        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
+                DUMMY_COMPONENT_NAME.flattenToString());
+
+    }
+
+    @Test
+    public void optInValueToSettings_optInValue_haveMatchString() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME2);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
@@ -152,11 +190,11 @@
     }
 
     @Test
-    public void optInValueToSettings_optInTwoDummyComponentName_haveOneDummyComponentName2String() {
+    public void optInValueToSettings_optInTwoValues_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
-        AccessibilityUtil.optInValueToSettings(mContext, PreferredShortcutType.SOFTWARE,
+        AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME2);
-        AccessibilityUtil.optInValueToSettings(mContext, PreferredShortcutType.SOFTWARE,
+        AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME2);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
@@ -165,19 +203,33 @@
     }
 
     @Test
-    public void optOutValueFromSettings_optOutDummyComponentName_emptyValue() {
+    public void optOutAllValuesToSettings_optOutValue_emptyString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
-        AccessibilityUtil.optOutValueFromSettings(mContext, PreferredShortcutType.SOFTWARE,
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        int shortcutTypes =
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+
+        AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
+                DUMMY_COMPONENT_NAME);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
+        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEmpty();
+    }
+
+    @Test
+    public void optOutValueFromSettings_optOutValue_emptyString() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        AccessibilityUtil.optOutValueFromSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
     }
 
     @Test
-    public void optOutValueFromSettings_optOutDummyComponentName2_haveDummyComponentName() {
+    public void optOutValueFromSettings_optOutValue_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString() + ":"
                 + DUMMY_COMPONENT_NAME2.flattenToString());
-        AccessibilityUtil.optOutValueFromSettings(mContext, PreferredShortcutType.SOFTWARE,
+        AccessibilityUtil.optOutValueFromSettings(mContext, UserShortcutType.SOFTWARE,
                 DUMMY_COMPONENT_NAME2);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
new file mode 100644
index 0000000..a34e04a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.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.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/MagnificationWindowControlPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationWindowControlPreferenceControllerTest.java
deleted file mode 100644
index 05dbb57..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationWindowControlPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +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.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;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@RunWith(RobolectricTestRunner.class)
-public class MagnificationWindowControlPreferenceControllerTest {
-    private static final String PREF_KEY = "screen_magnification_window_control_switch";
-    // TODO(b/146019459): Use magnification_window_control_enabled.
-    private static final String KEY_CONTROL = Settings.System.MASTER_MONO;
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private MagnificationWindowControlPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new MagnificationWindowControlPreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isChecked_enabledWindowControl_shouldReturnTrue() {
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, State.ON, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_disabledWindowControl_shouldReturnFalse() {
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, State.OFF, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableWindowControl() {
-        mController.setChecked(true);
-
-        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, State.UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(State.ON);
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableWindowControl() {
-        mController.setChecked(false);
-
-        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
-                KEY_CONTROL, State.UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(State.OFF);
-    }
-
-    @Retention(RetentionPolicy.SOURCE)
-    private @interface State {
-        int UNKNOWN = -1;
-        int OFF = 0;
-        int ON = 1;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
new file mode 100644
index 0000000..6f3f77d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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 static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.ResolveInfoBuilder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+public class RTTSettingPreferenceControllerTest {
+
+    private Context mContext;
+    private ShadowPackageManager mShadowPackageManager;
+    private RTTSettingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mShadowPackageManager = shadowOf(mContext.getPackageManager());
+        mController = spy(new RTTSettingPreferenceController(mContext, "rtt_setting"));
+        mController.mRTTIntent = new Intent("com.android.test.action.example");
+    }
+
+    @Test
+    public void getAvailabilityStatus_defaultDialerIsExpected_intentCanBeHandled_returnAVAILABLE() {
+        // Default dialer is expected.
+        doReturn(true).when(mController).isDialerSupportRTTSetting();
+        // Intent can be handled.
+        final ResolveInfo info = new ResolveInfoBuilder("pkg")
+                .setActivity("pkg", "class").build();
+        final Intent intent = new Intent("com.android.test.action.example");
+        mShadowPackageManager.addResolveInfoForIntent(intent, info);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_intentCanNotBeHandled_shouldReturnUNSUPPORTED_ON_DEVICE() {
+        // Default dialer is expected.
+        doReturn(true).when(mController).isDialerSupportRTTSetting();
+        // Intent can not be handled.
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_defaultDialerIsNotExpected_returnUNSUPPORTED_ON_DEVICE() {
+        // Default dialer is not expected.
+        doReturn(false).when(mController).isDialerSupportRTTSetting();
+        // Intent can be handled.
+        final ResolveInfo info = new ResolveInfoBuilder("pkg")
+                .setActivity("pkg", "class").build();
+        final Intent intent = new Intent("com.android.test.action.example");
+        mShadowPackageManager.addResolveInfoForIntent(intent, info);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
index 15c3c21..f3522a9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
@@ -69,7 +69,7 @@
     }
 
     @Test
-    public void testClickLinearLayout_checkboxClicked() {
+    public void clickLinearLayout_checkboxClicked() {
         mShortcutPreference.onBindViewHolder(mPreferenceViewHolder);
         mShortcutPreference.setOnClickListener(mListener);
 
@@ -81,7 +81,7 @@
     }
 
     @Test
-    public void testClickSettings_settingsClicked() {
+    public void clickSettings_settingsClicked() {
         mShortcutPreference.onBindViewHolder(mPreferenceViewHolder);
         mShortcutPreference.setOnClickListener(mListener);
 
@@ -92,7 +92,7 @@
     }
 
     @Test
-    public void testSetCheckedTrue_getCheckedIsTrue() {
+    public void setCheckedTrue_getCheckedIsTrue() {
         mShortcutPreference.setChecked(true);
 
         assertThat(mShortcutPreference.getChecked()).isEqualTo(true);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index c9ca772..9bebc9a 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accessibility;
 
+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.verify;
@@ -29,6 +31,7 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.accessibility.ToggleFeaturePreferenceFragment.AccessibilityUserShortcutType;
 import com.android.settings.widget.SwitchBar;
 
 import org.junit.Test;
@@ -36,11 +39,77 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 @RunWith(RobolectricTestRunner.class)
 public class ToggleFeaturePreferenceFragmentTest {
 
     private ToggleFeaturePreferenceFragmentTestable mFragment;
 
+    private static final String TEST_SERVICE_KEY_1 = "abc:111";
+    private static final String TEST_SERVICE_KEY_2 = "mno:222";
+    private static final String TEST_SERVICE_KEY_3 = "xyz:333";
+
+    private static final String TEST_SERVICE_NAME_1 = "abc";
+    private static final int TEST_SERVICE_VALUE_1 = 111;
+
+    @Test
+    public void a11yUserShortcutType_setConcatString_shouldReturnTargetValue() {
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                TEST_SERVICE_KEY_1);
+
+        assertThat(shortcut.getComponentName()).isEqualTo(TEST_SERVICE_NAME_1);
+        assertThat(shortcut.getUserShortcutType()).isEqualTo(TEST_SERVICE_VALUE_1);
+    }
+
+    @Test
+    public void a11yUserShortcutType_shouldUpdateConcatString() {
+        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
+                TEST_SERVICE_KEY_2);
+
+        shortcut.setComponentName(TEST_SERVICE_NAME_1);
+        shortcut.setUserShortcutType(TEST_SERVICE_VALUE_1);
+
+        assertThat(shortcut.flattenToString()).isEqualTo(TEST_SERVICE_KEY_1);
+    }
+
+    @Test
+    public void stringSet_convertA11yPreferredShortcut_shouldRemoveTarget() {
+        Set<String> mySet = new HashSet<>();
+        mySet.add(TEST_SERVICE_KEY_1);
+        mySet.add(TEST_SERVICE_KEY_2);
+        mySet.add(TEST_SERVICE_KEY_3);
+
+        final Set<String> filtered = mySet.stream().filter(
+                str -> str.contains(TEST_SERVICE_NAME_1)).collect(
+                Collectors.toSet());
+        mySet.removeAll(filtered);
+
+        assertThat(mySet).doesNotContain(TEST_SERVICE_KEY_1);
+        assertThat(mySet).hasSize(/* expectedSize= */2);
+    }
+
+    @Test
+    public void stringSet_convertA11yUserShortcutType_shouldReturnPreferredShortcut() {
+        int type = 0;
+        Set<String> mySet = new HashSet<>();
+        mySet.add(TEST_SERVICE_KEY_1);
+        mySet.add(TEST_SERVICE_KEY_2);
+        mySet.add(TEST_SERVICE_KEY_3);
+
+        final Set<String> filtered = mySet.stream().filter(
+                str -> str.contains(TEST_SERVICE_NAME_1)).collect(
+                Collectors.toSet());
+        for (String str : filtered) {
+            final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
+            type = shortcut.getUserShortcutType();
+        }
+
+        assertThat(type).isEqualTo(TEST_SERVICE_VALUE_1);
+    }
+
     @Test
     public void createFragment_shouldOnlyAddPreferencesOnce() {
         mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
new file mode 100644
index 0000000..6cf9ad6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -0,0 +1,141 @@
+/*
+ * 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.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings;
+
+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 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 ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
+            DUMMY_CLASS_NAME);
+    private static final String SOFTWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT;
+    private static final String HARDWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
+    private static final String TRIPLETAP_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
+    private static final String MAGNIFICATION_CONTROLLER_NAME =
+            "com.android.server.accessibility.MagnificationController";
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void hasValueInSettings_putValue_hasValue() {
+        setMagnificationTripleTapEnabled(/* enabled= */ true);
+
+        assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
+                mContext, UserShortcutType.TRIPLETAP)).isTrue();
+    }
+
+    @Test
+    public void optInAllValuesToSettings_optInValue_haveMatchString() {
+        int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP;
+
+        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
+                shortcutTypes);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
+                MAGNIFICATION_CONTROLLER_NAME);
+        assertThat(getMagnificationTripleTapStatus()).isTrue();
+
+    }
+
+    @Test
+    public void optInAllValuesToSettings_existOtherValue_optInValue_haveMatchString() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+
+        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
+                UserShortcutType.SOFTWARE);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
+                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+
+    }
+
+    @Test
+    public void optOutAllValuesToSettings_optOutValue_emptyString() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        setMagnificationTripleTapEnabled(/* enabled= */ true);
+        int shortcutTypes =
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+
+        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
+                mContext, shortcutTypes);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
+        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEmpty();
+        assertThat(getMagnificationTripleTapStatus()).isFalse();
+    }
+
+    @Test
+    public void optOutValueFromSettings_existOtherValue_optOutValue_haveMatchString() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY,
+                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY,
+                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+        int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
+
+        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
+                mContext, shortcutTypes);
+
+        assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
+                DUMMY_COMPONENT_NAME.flattenToString());
+        assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
+                DUMMY_COMPONENT_NAME.flattenToString());
+    }
+
+    private void putStringIntoSettings(String key, String componentName) {
+        Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
+    }
+
+    private void setMagnificationTripleTapEnabled(boolean enabled) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? ON : OFF);
+    }
+
+    private String getStringFromSettings(String key) {
+        return Settings.Secure.getString(mContext.getContentResolver(), key);
+    }
+
+    private boolean getMagnificationTripleTapStatus() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 12b93cd..2bb93b5 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -18,6 +18,7 @@
 
 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;
 
@@ -37,12 +38,10 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.internal.telephony.euicc.EuiccConnector;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;
 import com.android.settingslib.testutils.shadow.ShadowSmsApplication;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,8 +50,6 @@
 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.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
@@ -109,12 +106,6 @@
                 mPackageManagerService, mDevicePolicyManager);
     }
 
-    @After
-    @Config(shadows = {ShadowEuiccConnector.class})
-    public void tearDown() {
-        ShadowEuiccConnector.reset();
-    }
-
     private void verifyCalculateNumberOfPolicyInstalledApps(boolean async) {
         setUpUsersAndInstalledApps();
 
@@ -293,8 +284,7 @@
     }
 
     @Test
-    @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class,
-            ShadowEuiccConnector.class})
+    @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
     public void getKeepEnabledPackages_hasEuiccComponent_shouldContainEuiccPackage() {
         final String testDialer = "com.android.test.defaultdialer";
         final String testSms = "com.android.test.defaultsms";
@@ -305,7 +295,10 @@
         ShadowDefaultDialerManager.setDefaultDialerApplication(testDialer);
         final ComponentInfo componentInfo = new ComponentInfo();
         componentInfo.packageName = testEuicc;
-        ShadowEuiccConnector.setBestComponent(componentInfo);
+
+        ApplicationFeatureProviderImpl spyProvider = spy(new ApplicationFeatureProviderImpl(
+                mContext, mPackageManager, mPackageManagerService, mDevicePolicyManager));
+        doReturn(componentInfo).when(spyProvider).findEuiccService(mPackageManager);
 
         // Spy the real context to mock LocationManager.
         Context spyContext = spy(RuntimeEnvironment.application);
@@ -314,7 +307,7 @@
 
         ReflectionHelpers.setField(mProvider, "mContext", spyContext);
 
-        final Set<String> keepEnabledPackages = mProvider.getKeepEnabledPackages();
+        final Set<String> keepEnabledPackages = spyProvider.getKeepEnabledPackages();
 
         assertThat(keepEnabledPackages).contains(testEuicc);
     }
@@ -391,23 +384,4 @@
         resolveInfo.activityInfo = activityInfo;
         return resolveInfo;
     }
-
-    @Implements(EuiccConnector.class)
-    public static class ShadowEuiccConnector {
-
-        private static ComponentInfo sBestComponent;
-
-        @Implementation
-        protected static ComponentInfo findBestComponent(PackageManager packageManager) {
-            return sBestComponent;
-        }
-
-        public static void setBestComponent(ComponentInfo componentInfo) {
-            sBestComponent = componentInfo;
-        }
-
-        public static void reset() {
-            sBestComponent = null;
-        }
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 1e6faa1..8392ac1 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -41,6 +41,7 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -80,6 +81,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {ShadowSecureSettings.class})
     public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
         ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -91,6 +93,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {ShadowSecureSettings.class})
     public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
         ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -109,6 +112,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {ShadowSecureSettings.class})
     public void onResume_shouldUpdatePreference() {
         Settings.Secure.putString(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 3e46027..7de830c 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -44,6 +44,7 @@
 import com.android.settingslib.applications.DefaultAppInfo;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -94,6 +95,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {ShadowSecureSettings.class})
     public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
         final String flattenKey = "com.android.settings/assist";
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 9ec7f0b..dfacd81 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -45,6 +45,7 @@
 import com.android.settingslib.applications.DefaultAppInfo;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -106,6 +107,7 @@
     }
 
     @Test
+    @Ignore
     public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
         mPicker.onAttach((Context) mActivity);
 
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
index 74fb98f..fa1b7a2 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
@@ -61,7 +61,7 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
-        mController = new MusicViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
+        mController = new MusicViewHolderController(mContext, mSource, fsUuid, UserHandle.of(-1));
 
         View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
         mHolder = new ApplicationViewHolder(view);
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
index 5475b9c..f3c699c 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
@@ -60,7 +60,7 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
-        mController = new PhotosViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
+        mController = new PhotosViewHolderController(mContext, mSource, fsUuid, UserHandle.of(-1));
 
         final View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
         mHolder = new ApplicationViewHolder(view);
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
index 42a497a..e91c0fa 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
@@ -19,9 +19,9 @@
 import static org.mockito.Mockito.verify;
 
 import android.app.settings.SettingsEnums;
+import android.telephony.SmsManager;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -47,31 +47,31 @@
 
     @Test
     public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER,
+        mFragment.logSpecialPermissionChange(SmsManager.PREMIUM_SMS_CONSENT_ASK_USER,
                 "app");
         verify(mFeatureFactory.metricsFeatureProvider).action(
                 SettingsEnums.PAGE_UNKNOWN,
                 MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK,
                 mFragment.getMetricsCategory(),
                 "app",
-                SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER);
+                SmsManager.PREMIUM_SMS_CONSENT_ASK_USER);
 
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW,
+        mFragment.logSpecialPermissionChange(SmsManager.PREMIUM_SMS_CONSENT_NEVER_ALLOW,
                 "app");
         verify(mFeatureFactory.metricsFeatureProvider).action(
                 SettingsEnums.PAGE_UNKNOWN,
                 MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY,
                 mFragment.getMetricsCategory(),
                 "app",
-                SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW);
+                SmsManager.PREMIUM_SMS_CONSENT_NEVER_ALLOW);
 
-        mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW,
+        mFragment.logSpecialPermissionChange(SmsManager.PREMIUM_SMS_CONSENT_ALWAYS_ALLOW,
                 "app");
         verify(mFeatureFactory.metricsFeatureProvider).action(
                 SettingsEnums.PAGE_UNKNOWN,
                 MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW,
                 mFragment.getMetricsCategory(),
                 "app",
-                SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW);
+                SmsManager.PREMIUM_SMS_CONSENT_ALWAYS_ALLOW);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
index eaa4c3c..f52685c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -103,7 +102,7 @@
         verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect);
 
         mConnectButton.callOnClick();
-        verify(mCachedDevice).connect(eq(true));
+        verify(mCachedDevice).connect();
     }
 
     @Test
@@ -119,7 +118,7 @@
 
         // Click the button and make sure that connect (not disconnect) gets called.
         mConnectButton.callOnClick();
-        verify(mCachedDevice).connect(eq(true));
+        verify(mCachedDevice).connect();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index 4cc9b87..d329f5c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -122,6 +122,6 @@
     public void onClick_Preference_setConnect() {
         mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
 
-        verify(mCachedBluetoothDevice).connect(true);
+        verify(mCachedBluetoothDevice).connect();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 4a6816f..778bb79 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -81,7 +81,7 @@
         final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(mContext);
 
-        assertThat(niks).containsAllOf(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES,
+        assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES,
                 KEY_NEARBY_DEVICES, KEY_DISCOVERABLE_FOOTER);
     }
 
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index bbbeeb8..44b0187 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -20,7 +20,6 @@
 
 import com.android.settings.core.BasePreferenceControllerSignatureInspector;
 import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
-import com.android.settings.search.FragmentSearchIndexableCodeInspector;
 import com.android.settings.search.SearchIndexProviderCodeInspector;
 import com.android.settings.slices.SliceControllerInXmlCodeInspector;
 
@@ -72,9 +71,4 @@
     public void runLifecycleObserverInspection() {
         new LifecycleObserverCodeInspector(mClasses).run();
     }
-
-    @Test
-    public void runFragmentIndexableInspection() throws Exception {
-        new FragmentSearchIndexableCodeInspector(mClasses).run();
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index eea6388..3fdb7b4 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -16,6 +16,7 @@
 package com.android.settings.datausage;
 
 import static android.net.NetworkPolicy.CYCLE_NONE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -49,6 +50,7 @@
 import com.android.settingslib.NetworkPolicyEditor;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -142,6 +144,7 @@
 
     @Test
     @Config(shadows = ShadowFragment.class)
+    @Ignore
     public void onCreate_emptyArguments_shouldSetDefaultNetworkTemplate() {
         final BillingCycleSettings billingCycleSettings = spy(new BillingCycleSettings());
         when(billingCycleSettings.getContext()).thenReturn(mContext);
@@ -164,4 +167,4 @@
 
         assertThat(billingCycleSettings.mNetworkTemplate).isNotNull();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index d8dde39..d5eaa9a 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -40,6 +40,7 @@
 import com.android.settings.testutils.shadow.ShadowUtils;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -103,6 +104,7 @@
 
     @Test
     @Config(shadows = ShadowSubscriptionManager.class)
+    @Ignore
     public void configuration_withSim_shouldShowMobileAndWifi() {
         ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
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 a97c4e3..802f871 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -102,6 +102,8 @@
 
     @Test
     public void onIndexUpdated_checkFlow() {
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
+        when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
         when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mCodecConfigAAC);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.onIndexUpdated(mCurrentConfig);
@@ -138,27 +140,27 @@
 
     @Test
     public void getCurrentCodecConfig_verifyConfig() {
-        mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
         when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         assertThat(mController.getCurrentCodecConfig()).isEqualTo(mCodecConfigAAC);
     }
 
     @Test
     public void getSelectableConfigs_verifyConfig() {
-        mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
         when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         assertThat(mController.getSelectableConfigs(null)).isEqualTo(mCodecConfigs);
     }
 
     @Test
     public void getSelectableByCodecType_verifyConfig() {
-        mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
         when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         assertThat(mController.getSelectableByCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC))
                 .isEqualTo(mCodecConfigAAC);
@@ -166,14 +168,29 @@
 
     @Test
     public void getSelectableByCodecType_unavailable() {
-        mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
         when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         assertThat(mController.getSelectableByCodecType(
                 BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX)).isNull();
     }
 
+    @Test
+    public void onBluetoothServiceConnected_verifyBluetoothA2dpConfigStore() {
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        verify(mBluetoothA2dpConfigStore).setCodecType(mCodecConfigAAC.getCodecType());
+        verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
+        verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
+        verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority());
+        verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
+                mCodecConfigAAC.getCodecSpecific1());
+    }
+
     private static class AbstractBluetoothDialogPreferenceControllerImpl extends
             AbstractBluetoothDialogPreferenceController {
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index 88acbd0..851dfe0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -24,6 +24,7 @@
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.MAX_PHONE_COUNT_SINGLE_SIM;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;
@@ -33,6 +34,7 @@
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;
 import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;
 
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
@@ -61,7 +63,6 @@
 
 import androidx.lifecycle.LifecycleOwner;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowDeviceInfoUtils;
 import com.android.settingslib.DeviceInfoUtils;
@@ -125,6 +126,8 @@
     private static final String TEST_EID_FROM_CARD = "11111111111111111111111111111111";
     private static final String TEST_EID_FROM_MANAGER = "22222222222222222222222222222222";
 
+    private static final int MAX_PHONE_COUNT_DUAL_SIM = 2;
+
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
@@ -152,8 +155,7 @@
         ReflectionHelpers.setField(mController, "mEuiccManager", mEuiccManager);
         ReflectionHelpers.setField(mController, "mSubscriptionManager", mSubscriptionManager);
 
-        when(mTelephonyManager.getPhoneCount()).thenReturn(
-                PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(new ArrayList<UiccCardInfo>());
         when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(
                 new HashMap<Integer, Integer>());
@@ -429,7 +431,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldNotSetEid() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
@@ -468,7 +470,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldSetEidFromCard() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
@@ -507,7 +509,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldSetEidFromManager() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
@@ -549,7 +551,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldRemoveEid() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
@@ -589,8 +591,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldNotSetEidInSingleSimMode() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(
-                PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo = new UiccCardInfo(
@@ -620,8 +621,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldSetEidInSingleSimModeWithEnabledEuicc() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(
-                PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo = new UiccCardInfo(
@@ -653,8 +653,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldSetEidInSingleSimModeWithDisabledEuicc() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(
-                PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo = new UiccCardInfo(
@@ -686,8 +685,7 @@
     @Test
     @Ignore
     public void initialize_updateEid_shouldRemoveEidInSingleSimMode() {
-        when(mTelephonyManager.getPhoneCount()).thenReturn(
-                PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM);
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
 
         ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
         UiccCardInfo uiccCardInfo = new UiccCardInfo(
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index 65dc621..824f6b4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -29,14 +29,12 @@
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.UserManager;
-import android.util.FeatureFlagUtils;
 import android.util.SparseArray;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawable.UserIconDrawable;
@@ -81,7 +79,6 @@
         when(mScreen.findPreference(anyString())).thenReturn(mGroup);
         when(mGroup.getKey()).thenReturn(TARGET_PREFERENCE_GROUP_KEY);
 
-        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE, false);
     }
 
     @Test
@@ -124,7 +121,6 @@
 
     @Test
     public void getSecondaryUserControllers_notWorkProfile_addSecondaryUserController() {
-        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE, false);
         final ArrayList<UserInfo> userInfos = new ArrayList<>();
         final UserInfo secondaryUser = new UserInfo();
         secondaryUser.id = 10;
@@ -142,7 +138,6 @@
 
     @Test
     public void getSecondaryUserControllers_workProfile_addNoSecondaryUserController() {
-        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE, true);
         final ArrayList<UserInfo> userInfos = new ArrayList<>();
         final UserInfo secondaryUser = new UserInfo();
         secondaryUser.id = 10;
@@ -155,12 +150,11 @@
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
-        assertThat(controllers.get(
-                0) instanceof SecondaryUserController.NoSecondaryUserController).isTrue();
+        assertThat(controllers.get(0) instanceof SecondaryUserController).isTrue();
     }
 
     @Test
-    public void profilesOfPrimaryUserAreNotIgnored() {
+    public void profilesOfPrimaryUserAreIgnored() {
         final ArrayList<UserInfo> userInfos = new ArrayList<>();
         final UserInfo secondaryUser = new UserInfo();
         secondaryUser.id = mPrimaryUser.id;
@@ -172,9 +166,8 @@
         final List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
-        assertThat(controllers).hasSize(2);
-        assertThat(controllers.get(0) instanceof UserProfileController).isTrue();
-        assertThat(controllers.get(1) instanceof SecondaryUserController).isFalse();
+        assertThat(controllers).hasSize(1);
+        assertThat(controllers.get(0) instanceof SecondaryUserController).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 275c1e0..ebb5292 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -53,6 +53,7 @@
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
@@ -65,6 +66,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class StorageItemPreferenceControllerTest {
@@ -276,6 +278,7 @@
     }
 
     @Test
+    @Config(shadows = ShadowUserManager.class)
     public void testMeasurementCompletedUpdatesPreferences() {
         final StorageItemPreference audio = new StorageItemPreference(mContext);
         final StorageItemPreference image = new StorageItemPreference(mContext);
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index e8d7713..00993f6 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -31,6 +31,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.net.Uri;
+import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.slices.CustomSliceRegistry;
@@ -110,6 +111,20 @@
                 eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW), any(String.class));
     }
 
+    @Test
+    public void getCardCount_noConfiguredCardCount_returnDefaultCardCount() {
+        assertThat(mContextualCardLoader.getCardCount()).isEqualTo(DEFAULT_CARD_COUNT);
+    }
+
+    @Test
+    public void getCardCount_hasConfiguredCardCount_returnConfiguredCardCount() {
+        int configCount = 4;
+        Settings.Global.putLong(mContext.getContentResolver(),
+                ContextualCardLoader.CONTEXTUAL_CARD_COUNT, configCount);
+
+        assertThat(mContextualCardLoader.getCardCount()).isEqualTo(configCount);
+    }
+
     private List<ContextualCard> getContextualCardList() {
         final List<ContextualCard> cards = new ArrayList<>();
         cards.add(new ContextualCard.Builder()
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
index 1af7b2b..7170bdd 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.homepage.contextualcards.slices;
 
+import static android.content.res.Configuration.UI_MODE_NIGHT_NO;
+import static android.content.res.Configuration.UI_MODE_NIGHT_YES;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.doReturn;
@@ -68,7 +71,7 @@
 
         // Set-up specs for SliceMetadata.
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-        mDarkThemeSlice = spy(new DarkThemeSlice(mContext));
+        mDarkThemeSlice = new DarkThemeSlice(mContext);
         mDarkThemeSlice.sKeepSliceShow = false;
     }
 
@@ -81,7 +84,7 @@
 
     @Test
     public void isAvailable_inDarkThemeMode_returnFalse() {
-        doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
+        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
 
         assertThat(mDarkThemeSlice.isAvailable(mContext)).isFalse();
     }
@@ -111,7 +114,7 @@
 
     @Test
     public void getSlice_notAvailable_returnErrorSlice() {
-        doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
+        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
 
         final Slice mediaSlice = mDarkThemeSlice.getSlice();
         final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
@@ -126,7 +129,7 @@
         mDarkThemeSlice.sActiveUiSession =
                 mFeatureFactory.slicesFeatureProvider.getUiSessionToken() + 1;
 
-        doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
+        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
 
         final Slice mediaSlice = mDarkThemeSlice.getSlice();
         final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
@@ -144,6 +147,26 @@
     }
 
     @Test
+    public void getSlice_sliceNotClicked_notAvailable_returnErrorSlice() {
+        mDarkThemeSlice.sSliceClicked = false;
+
+        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
+
+        final Slice mediaSlice = mDarkThemeSlice.getSlice();
+        final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
+        assertThat(metadata.isErrorSlice()).isTrue();
+    }
+
+    @Test
+    public void getSlice_sliceClicked_isAvailable_returnSlice() {
+        mDarkThemeSlice.sSliceClicked = true;
+
+        setBatteryCapacityLevel(40);
+
+        assertThat(mDarkThemeSlice.getSlice()).isNotNull();
+    }
+
+    @Test
     public void getSlice_isAvailable_returnSlice() {
         setBatteryCapacityLevel(40);
 
@@ -163,7 +186,7 @@
     }
 
     private void setBatteryCapacityLevel(int power_level) {
-        doReturn(false).when(mDarkThemeSlice).isDarkThemeMode(mContext);
+        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
         doReturn(mBatteryManager).when(mContext).getSystemService(BatteryManager.class);
         when(mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY))
                 .thenReturn(power_level);
diff --git a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java
index 2e9fa30..f92b012 100644
--- a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java
@@ -20,6 +20,7 @@
 
 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;
@@ -31,6 +32,7 @@
 import android.media.AudioManager;
 import android.net.Uri;
 
+import com.android.settings.testutils.shadow.ShadowAudioManager;
 import com.android.settingslib.media.LocalMediaManager;
 import com.android.settingslib.media.MediaDevice;
 
@@ -40,12 +42,14 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowAudioManager.class)
 public class MediaDeviceUpdateWorkerTest {
 
     private static final Uri URI = Uri.parse("content://com.android.settings.slices/test");
@@ -61,6 +65,7 @@
     private MediaDevice mMediaDevice1;
     private MediaDevice mMediaDevice2;
     private ShadowApplication mShadowApplication;
+    private AudioManager mAudioManager;
 
     @Before
     public void setUp() {
@@ -69,6 +74,7 @@
         mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI);
         mResolver = mock(ContentResolver.class);
         mShadowApplication = ShadowApplication.getInstance();
+        mAudioManager = mContext.getSystemService(AudioManager.class);
 
         mMediaDevice1 = mock(MediaDevice.class);
         when(mMediaDevice1.getId()).thenReturn(TEST_DEVICE_1_ID);
@@ -95,6 +101,13 @@
     }
 
     @Test
+    public void onDeviceAttributesChanged_shouldNotifyChange() {
+        mMediaDeviceUpdateWorker.onDeviceAttributesChanged();
+
+        verify(mResolver).notifyChange(URI, null);
+    }
+
+    @Test
     public void onDeviceListUpdate_sameDeviceList_shouldBeEqual() {
         mMediaDeviceUpdateWorker.onDeviceListUpdate(mMediaDevices);
 
@@ -103,7 +116,8 @@
         newDevices.add(mMediaDevice2);
 
         mMediaDeviceUpdateWorker.onDeviceListUpdate(newDevices);
-        final List<MediaDevice> devices = mMediaDeviceUpdateWorker.getMediaDevices();
+        final List<MediaDevice> devices =
+                new ArrayList<>(mMediaDeviceUpdateWorker.getMediaDevices());
 
         assertThat(devices.get(0).getId()).isEqualTo(newDevices.get(0).getId());
         assertThat(devices.get(1).getId()).isEqualTo(newDevices.get(1).getId());
@@ -121,7 +135,8 @@
         newDevices.add(device3);
 
         mMediaDeviceUpdateWorker.onDeviceListUpdate(newDevices);
-        final List<MediaDevice> devices = mMediaDeviceUpdateWorker.getMediaDevices();
+        final List<MediaDevice> devices =
+                new ArrayList<>(mMediaDeviceUpdateWorker.getMediaDevices());
 
         assertThat(devices.size()).isEqualTo(newDevices.size());
     }
@@ -134,14 +149,16 @@
         newDevices.add(mMediaDevice1);
 
         mMediaDeviceUpdateWorker.onDeviceListUpdate(newDevices);
-        final List<MediaDevice> devices = mMediaDeviceUpdateWorker.getMediaDevices();
+        final List<MediaDevice> devices =
+                new ArrayList<>(mMediaDeviceUpdateWorker.getMediaDevices());
 
         assertThat(devices.size()).isEqualTo(newDevices.size());
     }
 
     @Test
-    public void onReceive_shouldNotifyChange() {
+    public void onReceive_inCallState_shouldNotifyChange() {
         mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
 
         mMediaDeviceUpdateWorker.onSlicePinned();
         final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
@@ -151,4 +168,18 @@
 
         verify(mResolver).notifyChange(URI, null);
     }
+
+    @Test
+    public void onReceive_notInCallState_doNothing() {
+        mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+
+        mMediaDeviceUpdateWorker.onSlicePinned();
+        final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
+        for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
+            receiver.onReceive(mContext, intent);
+        }
+
+        verify(mResolver, never()).notifyChange(URI, null);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
index 288c8e8..c9b9ff9 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
@@ -64,7 +64,6 @@
 @Config(shadows = {ShadowBluetoothAdapter.class})
 public class MediaOutputSliceTest {
 
-    private static final String TEST_PACKAGE_NAME = "com.fake.android.music";
     private static final String TEST_DEVICE_1_ID = "test_device_1_id";
     private static final String TEST_DEVICE_1_NAME = "test_device_1_name";
     private static final int TEST_DEVICE_1_ICON =
@@ -100,12 +99,12 @@
         mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, MEDIA_OUTPUT_SLICE_URI);
         mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
         mMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
-        mMediaOutputSlice.init(TEST_PACKAGE_NAME, mMediaDeviceUpdateWorker);
+        mMediaOutputSlice.init(mMediaDeviceUpdateWorker);
     }
 
     @Test
     public void getSlice_workerIsNull_shouldReturnZeroRow() {
-        mMediaOutputSlice.init(TEST_PACKAGE_NAME, null);
+        mMediaOutputSlice.init(null);
 
         final Slice slice = mMediaOutputSlice.getSlice();
 
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 702d689..e2410c1 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -46,6 +46,7 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -120,6 +121,7 @@
     }
 
     @Test
+    @Ignore
     public void serviceStateChange_shouldUpdatePrefSummary() {
         final String testCarrierName = "test";
         final Preference mPreference = mock(Preference.class);
@@ -145,6 +147,7 @@
     }
 
     @Test
+    @Ignore
     public void airplaneModeTurnedOn_shouldDisablePreference() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Global.AIRPLANE_MODE_ON, 1);
@@ -155,6 +158,7 @@
     }
 
     @Test
+    @Ignore
     public void airplaneModeTurnedOffAndNoUserRestriction_shouldEnablePreference() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Global.AIRPLANE_MODE_ON, 0);
@@ -166,6 +170,7 @@
     }
 
     @Test
+    @Ignore
     public void airplaneModeTurnedOffAndHasUserRestriction_shouldDisablePreference() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Global.AIRPLANE_MODE_ON, 0);
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
index 7960906..85fc9a2 100644
--- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -32,13 +32,13 @@
 import android.telephony.UiccSlotInfo;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -88,37 +88,7 @@
     }
 
     @Test
-    public void getAvailableSubscriptions_oneSelectableOneDisabledPSim_twoResults() {
-        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
-        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
-
-        when(info1.getSubscriptionId()).thenReturn(111);
-        when(info1.getSimSlotIndex()).thenReturn(-1);
-        when(info1.getCardString()).thenReturn("info1_cardid");
-
-        when(info2.getSubscriptionId()).thenReturn(222);
-        when(info2.getSimSlotIndex()).thenReturn(0);
-        when(info2.getCardString()).thenReturn("info2_cardid");
-
-        when(mSubMgr.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));
-        when(mSubMgr.getAllSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
-
-        final UiccSlotInfo info2slot = mock(UiccSlotInfo.class);
-        when(info2slot.getCardStateInfo()).thenReturn(CARD_STATE_INFO_PRESENT);
-        when(info2slot.getLogicalSlotIdx()).thenReturn(0);
-        when(info2slot.getCardId()).thenReturn("info2_cardid");
-
-        final UiccSlotInfo[] slotInfos = {info2slot};
-        when(mTelMgr.getUiccSlotsInfo()).thenReturn(slotInfos);
-
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
-        assertThat(subs).hasSize(2);
-        assertThat(subs.get(0).getSubscriptionId()).isEqualTo(111);
-        assertThat(subs.get(1).getSubscriptionId()).isEqualTo(222);
-    }
-
-
-    @Test
+    @Ignore
     public void getAvailableSubscriptions_oneSelectableTwoDisabledPSimsOneAbsent_twoResults() {
         final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
         final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
index d362837..e03da10 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -24,10 +24,8 @@
 import static org.mockito.Mockito.doNothing;
 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.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PersistableBundle;
@@ -36,7 +34,6 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.network.ApnSettings;
 import com.android.settingslib.RestrictedPreference;
 
@@ -46,7 +43,6 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
@@ -89,7 +85,7 @@
 
     @Test
     public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        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);
@@ -99,7 +95,7 @@
 
     @Test
     public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        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);
@@ -109,7 +105,7 @@
 
     @Test
     public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        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);
@@ -119,7 +115,7 @@
 
     @Test
     public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
         when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
@@ -128,7 +124,7 @@
 
     @Test
     public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        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);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
index fc8fb16..d978fea 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
@@ -28,8 +28,8 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import android.content.Context;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -38,16 +38,15 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
-import com.android.internal.telephony.PhoneConstants;
 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.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
@@ -90,7 +89,7 @@
 
     @Test
     public void getAvailabilityStatus_cdmaWithFlagOff_returnUnavailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
         final PersistableBundle bundle = new PersistableBundle();
         bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);
         doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
@@ -100,7 +99,7 @@
 
     @Test
     public void getAvailabilityStatus_cdmaWithFlagOnreturnAvailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
         final PersistableBundle bundle = new PersistableBundle();
         bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
         doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
@@ -110,7 +109,7 @@
 
     @Test
     public void getAvailabilityStatus_gsmWithFlagOnreturnAvailable() {
-        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
         final PersistableBundle bundle = new PersistableBundle();
         bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
         doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
index 46e6978..ddfae64 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
@@ -24,9 +24,7 @@
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -39,7 +37,6 @@
 
 import androidx.preference.Preference;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
@@ -48,7 +45,6 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
@@ -94,7 +90,7 @@
 
     @Test
     public void getAvailabilityStatus_allConfigOn_returnAvailable() {
-        doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
+        doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
                 false);
 
@@ -105,7 +101,7 @@
     public void getAvailabilityStatus_missUrl_returnUnavailable() {
         Settings.Global.putString(mContext.getContentResolver(),
                 Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
-        doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
+        doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
                 false);
 
@@ -117,7 +113,7 @@
 
     @Test
     public void getAvailabilityStatus_notCdma_returnUnavailable() {
-        doReturn(PhoneConstants.LTE_ON_CDMA_FALSE).when(mTelephonyManager).getLteOnCdmaMode();
+        doReturn(false).when(mTelephonyManager).isGlobalModeEnabled();
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
                 false);
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index ea96e29..d12d543 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -20,6 +20,7 @@
 
 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;
 
@@ -392,8 +393,8 @@
 
     @Test
     public void onPreferenceChange_updateSuccess() {
-        doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+        doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
 
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
@@ -405,8 +406,8 @@
 
     @Test
     public void onPreferenceChange_updateFail() {
-        doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+        doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
 
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 8c22d69..29f0f25 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -98,7 +98,6 @@
     public void isDialogNeeded_disableSingleSim_returnFalse() {
         doReturn(true).when(mTelephonyManager).isDataEnabled();
         doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         doReturn(1).when(mTelephonyManager).getActiveModemCount();
 
         assertThat(mController.isDialogNeeded()).isFalse();
@@ -130,7 +129,6 @@
     public void onPreferenceChange_singleSim_On_shouldEnableData() {
         doReturn(true).when(mTelephonyManager).isDataEnabled();
         doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         doReturn(1).when(mTelephonyManager).getActiveModemCount();
 
         mController.onPreferenceChange(mPreference, true);
@@ -142,7 +140,6 @@
     public void onPreferenceChange_multiSim_On_shouldEnableData() {
         doReturn(true).when(mTelephonyManager).isDataEnabled();
         doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         doReturn(2).when(mTelephonyManager).getActiveModemCount();
 
         mController.onPreferenceChange(mPreference, true);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
index c66f75f..4cc8f36 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
@@ -19,6 +19,7 @@
 
 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.times;
@@ -76,7 +77,7 @@
         doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
         doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
         doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
         doReturn(SUB_ID).when(mSubscriptionInfo).getSubscriptionId();
         doReturn(new ArrayList<>(Arrays.asList(mSubscriptionInfo)))
                 .when(mSubscriptionManager).getSelectableSubscriptionInfoList();
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
index 7ff3ab3..9bf8370 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
@@ -43,6 +43,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -90,6 +91,7 @@
     }
 
     @Test
+    @Ignore
     public void onAttach_noCrash() {
         mFragment.onAttach(mContext);
     }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index b1ef202..bbb8aac 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -21,7 +21,6 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -40,7 +39,6 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import org.junit.Before;
@@ -170,14 +168,14 @@
 
     @Test
     public void isCdmaOptions_phoneTypeCdma_returnTrue() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_CDMA);
+        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(PhoneConstants.PHONE_TYPE_GSM);
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
 
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -189,7 +187,7 @@
 
     @Test
     public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+        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);
@@ -199,14 +197,14 @@
 
     @Test
     public void getSearchableSubscriptionId_oneActive_returnValid() {
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID_1});
-
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1));
         assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext)).isEqualTo(SUB_ID_1);
     }
 
     @Test
     public void getSearchableSubscriptionId_nonActive_returnInvalid() {
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[0]);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
 
         assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext))
                 .isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -227,7 +225,7 @@
                 false);
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
         mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false);
-        when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
 
         assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
                 .isTrue();
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkOperatorPreferenceTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkOperatorPreferenceTest.java
deleted file mode 100644
index 3a61195..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/NetworkOperatorPreferenceTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static 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.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.telephony.CellInfo;
-
-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 NetworkOperatorPreferenceTest {
-    private static final int LEVEL = 2;
-
-    @Mock
-    private Resources mResources;
-    @Mock
-    private CellInfo mCellInfo;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getResources()).thenReturn(mResources);
-    }
-
-    @Test
-    public void setIcon_useOldApi_doNothing() {
-        when(mResources.getBoolean(com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI))
-                .thenReturn(false);
-        final NetworkOperatorPreference preference = spy(
-                new NetworkOperatorPreference(mContext, mCellInfo,
-                        new ArrayList<>() /* forbiddenPlmns */, false /* show4GForLTE */));
-
-        preference.setIcon(LEVEL);
-
-        verify(preference, never()).setIcon(any(Drawable.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
index 1f8c16d..b90f0cf 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.network.telephony;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertTrue;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
@@ -32,16 +32,9 @@
 import android.telephony.NetworkScanRequest;
 import android.telephony.TelephonyManager;
 import android.telephony.TelephonyScanManager;
-import com.android.internal.telephony.CellNetworkScanResult;
-import com.android.internal.telephony.OperatorInfo;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import org.junit.After;
+
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -51,6 +44,11 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 @RunWith(RobolectricTestRunner.class)
 public class NetworkScanHelperTest {
 
@@ -58,7 +56,7 @@
     private TelephonyManager mTelephonyManager;
 
     @Mock
-    private CellNetworkScanResult mCellNetworkScanResult;
+    private List<CellInfo> mCellInfos;
 
     @Mock
     private NetworkScanHelper.NetworkScanCallback mNetworkScanCallback;
@@ -72,7 +70,6 @@
     private static final int SUB_ID = 1;
 
     private NetworkScan mNetworkScan;
-    private OperatorInfo mOperatorInfo;
 
     @Before
     public void setUp() {
@@ -84,62 +81,11 @@
                 mNetworkScanCallback, mNetworkScanExecutor);
 
         mNetworkScan = spy(new NetworkScan(SCAN_ID, SUB_ID));
-        mOperatorInfo = new OperatorInfo("Testing", "Test", "12345", "unknown");
-    }
-
-    @Test
-    public void startNetworkScan_scanOnceAndSuccess_completionWithResult() {
-        ArrayList<OperatorInfo> expectedResult = new ArrayList<OperatorInfo>();
-        expectedResult.add(mOperatorInfo);
-
-        when(mTelephonyManager.getAvailableNetworks()).thenReturn(mCellNetworkScanResult);
-        when(mCellNetworkScanResult.getStatus()).thenReturn(
-                CellNetworkScanResult.STATUS_SUCCESS);
-        when(mCellNetworkScanResult.getOperators()).thenReturn(expectedResult);
-
-        ArgumentCaptor<List<CellInfo>> argument = ArgumentCaptor.forClass(List.class);
-
-        startNetworkScan_waitForAll(true);
-
-        verify(mNetworkScanCallback, times(1)).onResults(argument.capture());
-        List<CellInfo> actualResult = argument.getValue();
-        assertThat(actualResult.size()).isEqualTo(expectedResult.size());
-        verify(mNetworkScanCallback, times(1)).onComplete();
-    }
-
-    @Test
-    public void startNetworkScan_scanOnceAndFail_failureWithErrorCode() {
-        when(mTelephonyManager.getAvailableNetworks()).thenReturn(mCellNetworkScanResult);
-        when(mCellNetworkScanResult.getStatus()).thenReturn(
-                CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE);
-
-        startNetworkScan_waitForAll(true);
-
-        verify(mNetworkScanCallback, times(1)).onError(anyInt());
-    }
-
-    @Test
-    public void startNetworkScan_scanOnceAndAbort_withoutCrash() {
-        when(mCellNetworkScanResult.getStatus()).thenReturn(
-                CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE);
-
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                Thread.sleep(THREAD_EXECUTION_TIMEOUT_MS);
-                return mCellNetworkScanResult;
-            }
-        }).when(mTelephonyManager).getAvailableNetworks();
-
-        startNetworkScan_waitForAll(false);
-
-        verify(mNetworkScanCallback, times(0)).onError(anyInt());
     }
 
     @Test
     public void startNetworkScan_incrementalAndSuccess_completionWithResult() {
-        ArrayList<CellInfo> expectedResult = new ArrayList<CellInfo>();
-        expectedResult.add(CellInfoUtil.convertOperatorInfoToCellInfo(mOperatorInfo));
+        when(mCellInfos.size()).thenReturn(1);
 
         doAnswer(new Answer() {
             @Override
@@ -147,7 +93,7 @@
                 TelephonyScanManager.NetworkScanCallback callback =
                         (TelephonyScanManager.NetworkScanCallback)
                         (invocation.getArguments()[2]);
-                callback.onResults(expectedResult);
+                callback.onResults(mCellInfos);
                 callback.onComplete();
                 return mNetworkScan;
             }
@@ -161,7 +107,7 @@
 
         verify(mNetworkScanCallback, times(1)).onResults(argument.capture());
         List<CellInfo> actualResult = argument.getValue();
-        assertThat(actualResult.size()).isEqualTo(expectedResult.size());
+        assertThat(actualResult.size()).isEqualTo(mCellInfos.size());
         verify(mNetworkScanCallback, times(1)).onComplete();
     }
 
@@ -184,7 +130,7 @@
                 TelephonyScanManager.NetworkScanCallback callback =
                         (TelephonyScanManager.NetworkScanCallback)
                         (invocation.getArguments()[2]);
-                callback.onError(CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE);
+                callback.onError(NetworkScan.ERROR_MODEM_ERROR);
                 return mNetworkScan;
             }
         }).when(mTelephonyManager).requestNetworkScan(
@@ -197,6 +143,7 @@
     }
 
     @Test
+    @Ignore
     public void startNetworkScan_incrementalAndAbort_doStop() {
         doReturn(mNetworkScan).when(mTelephonyManager).requestNetworkScan(
                 any(NetworkScanRequest.class), any(Executor.class),
@@ -207,28 +154,8 @@
         verify(mNetworkScan, times(1)).stopScan();
     }
 
-    private void startNetworkScan_waitForAll(boolean waitForCompletion) {
-        mNetworkScanHelper.startNetworkScan(
-                NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
-        if (!waitForCompletion) {
-            mNetworkScanHelper.stopNetworkQuery();
-        }
-
-        mNetworkScanExecutor.shutdown();
-
-        boolean executorTerminate = false;
-        try {
-            executorTerminate = mNetworkScanExecutor.awaitTermination(
-                    THREAD_EXECUTION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-        } catch (Exception ex) {
-        }
-
-        assertThat(executorTerminate).isEqualTo(waitForCompletion);
-    }
-
     private void startNetworkScan_incremental(boolean waitForCompletion) {
-        mNetworkScanHelper.startNetworkScan(
-                NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS);
+        mNetworkScanHelper.startNetworkScan();
         if (!waitForCompletion) {
             mNetworkScanHelper.stopNetworkQuery();
         }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
index 0d50e9e..1feb08b 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 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;
 
@@ -140,8 +141,8 @@
 
     @Test
     public void onPreferenceChange_updateSuccess() {
-        doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+        doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
 
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
@@ -153,8 +154,8 @@
 
     @Test
     public void onPreferenceChange_updateFail() {
-        doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+        doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
 
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
index 0d94928..a69ab53 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
@@ -48,6 +48,7 @@
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -99,6 +100,7 @@
     }
 
     @Test
+    @Ignore
     public void dialog_cancelButtonClicked_setDisplayNameAndIconTintNotCalled() {
         when(mSubscriptionMgr.getActiveSubscriptionInfo(mSubscriptionId)).thenReturn(
                 mSubscriptionInfo);
@@ -114,6 +116,7 @@
     }
 
     @Test
+    @Ignore
     public void dialog_saveButtonClicked_setDisplayNameAndIconTint() {
         when(mSubscriptionMgr.getActiveSubscriptionInfo(mSubscriptionId)).thenReturn(
                 mSubscriptionInfo);
@@ -137,6 +140,7 @@
     }
 
     @Test
+    @Ignore
     public void populateView_infoIsOpportunistic_hideNumberLabel() {
         final View view = LayoutInflater.from(mActivity).inflate(
                 R.layout.dialog_mobile_network_rename, null);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
index 886ea17..6ba2ffa 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
@@ -22,6 +22,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 
 import org.junit.Before;
@@ -32,12 +33,16 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+
 @RunWith(RobolectricTestRunner.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;
@@ -49,7 +54,7 @@
         mContext = spy(RuntimeEnvironment.application);
         when(mContext.getSystemService(SubscriptionManager.class))
                 .thenReturn(mSubscriptionManager);
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{});
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(VALID_SUB_ID);
         mPreferenceController = new TestPreferenceController(mContext, "prefKey");
     }
 
@@ -62,8 +67,8 @@
 
     @Test
     public void isAvailable_noIdSetHoweverHasDefaultOne_returnTrue() {
-        when(mSubscriptionManager.getActiveSubscriptionIdList())
-                .thenReturn(new int[]{VALID_SUB_ID});
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
 
         assertThat(mPreferenceController.isAvailable()).isTrue();
     }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
index 1c79266..ffd0eb8 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
@@ -40,6 +40,7 @@
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -174,6 +175,7 @@
     }
 
     @Test
+    @Ignore
     public void displayPreference_available_setsSubscriptionIdOnIntent() {
         final Intent intent = new Intent();
         mPreference.setIntent(intent);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
index d94ffae..bcc82ba 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -34,8 +34,6 @@
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceManager;
 
-import com.android.internal.telephony.Phone;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -90,33 +88,37 @@
     public void onPreferenceChange_selectNV_returnNVMode() {
         doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
 
-        mController.onPreferenceChange(mPreference, Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+        mController.onPreferenceChange(mPreference, Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
 
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.CDMA_SUBSCRIPTION_MODE,
-                Phone.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(Phone.CDMA_SUBSCRIPTION_NV);
+                TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(
+                        TelephonyManager.CDMA_SUBSCRIPTION_NV);
     }
 
     @Test
     public void updateState_stateRUIM_displayRUIM() {
         Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.CDMA_SUBSCRIPTION_NV);
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_NV);
 
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
     }
 
     @Test
     public void updateState_stateUnknown_doNothing() {
-        mPreference.setValue(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+        mPreference.setValue(Integer.toString(TelephonyManager.CDMA_SUBSCRIPTION_NV));
         Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.CDMA_SUBSCRIPTION_UNKNOWN);
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN);
 
         mController.updateState(mPreference);
 
         // Still NV mode
-        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
index c9af06d..fd79515 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
@@ -77,7 +77,7 @@
 
     private Context mContext;
     private ContentResolver mContentResolver;
-    private int mTitleResId = R.string.zen_sound_title;
+    private int mTitleResId = R.string.zen_mode_settings_title;
 
     @Before
     public void setup() {
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
index 25e9747..e04436e 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
@@ -79,4 +79,4 @@
         mController.updateState(pref);
         verify(pref).setSummary(any());
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/FragmentSearchIndexableCodeInspector.java b/tests/robotests/src/com/android/settings/search/FragmentSearchIndexableCodeInspector.java
deleted file mode 100644
index a24a643..0000000
--- a/tests/robotests/src/com/android/settings/search/FragmentSearchIndexableCodeInspector.java
+++ /dev/null
@@ -1,159 +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.search;
-
-import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_FRAGMENT;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.core.PreferenceXmlParserUtils;
-import com.android.settings.core.codeinspection.CodeInspector;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.search.SearchIndexableData;
-
-import org.robolectric.RuntimeEnvironment;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * {@link CodeInspector} to ensure preferences with fragments implement search components correctly.
- */
-public class FragmentSearchIndexableCodeInspector extends CodeInspector {
-
-    private final String mErrorNonIndexFragments =
-            "The following fragments were used by 'android:fragment=Fragment_Class_Name' in "
-                    + "corresponding caller preference Xml. This preference won't be searchable, "
-                    + "the fragment should implement SearchIndexable for Settings Search. If it "
-                    + "should not be searchable, add the fragment's classname to "
-                    + "grandfather_fragment_not_searchable. Fragments:\n";
-
-    private final Context mContext;
-    private final List<String> mXmlDeclaredFragments = new ArrayList<>();
-    private final List<String> mGrandfatherNotSearchIndesable = new ArrayList<>();
-
-    public FragmentSearchIndexableCodeInspector(List<Class<?>> classes) throws Exception {
-        super(classes);
-        mContext = RuntimeEnvironment.application;
-
-        initDeclaredFragments();
-        initializeGrandfatherList(mGrandfatherNotSearchIndesable,
-                "grandfather_fragment_not_searchable");
-    }
-
-    @Override
-    public void run() {
-        for (Class<?> clazz : mClasses) {
-            if (!isConcreteSettingsClass(clazz)) {
-                // Only care about non-abstract classes.
-                continue;
-            }
-            if (!InstrumentedPreferenceFragment.class.isAssignableFrom(clazz)) {
-                // Only care about InstrumentedPreferenceFragment
-                continue;
-            }
-
-            try {
-                clazz.getField("SEARCH_INDEX_DATA_PROVIDER");
-                mXmlDeclaredFragments.remove(clazz.getName());
-                continue;
-            } catch (NoSuchFieldException e) {
-            }
-
-            if (SearchIndexable.class.isAssignableFrom(clazz)) {
-                mXmlDeclaredFragments.remove(clazz.getName());
-                continue;
-            }
-        }
-
-        mXmlDeclaredFragments.removeAll(mGrandfatherNotSearchIndesable);
-
-        final String missingFragmentError =
-                buildErrorMessage(mErrorNonIndexFragments, mXmlDeclaredFragments);
-
-        assertWithMessage(missingFragmentError).that(mXmlDeclaredFragments).isEmpty();
-    }
-
-    private String buildErrorMessage(String errorSummary, List<String> errorClasses) {
-        final StringBuilder error = new StringBuilder(errorSummary);
-        for (String c : errorClasses) {
-            error.append(c).append("\n");
-        }
-        return error.toString();
-    }
-
-    private void initDeclaredFragments() throws IOException, XmlPullParserException {
-        final List<Integer> xmlResources = getIndexableXml();
-        for (int xmlResId : xmlResources) {
-            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
-                    xmlResId, PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_FRAGMENT);
-            for (Bundle bundle : metadata) {
-                final String fragmentClassName = bundle.getString(METADATA_FRAGMENT);
-                if (TextUtils.isEmpty(fragmentClassName)) {
-                    continue;
-                }
-                if (!mXmlDeclaredFragments.contains(fragmentClassName)) {
-                    mXmlDeclaredFragments.add(fragmentClassName);
-                }
-            }
-        }
-        // We definitely have some fragments in xml, so assert not-empty here as a proxy to
-        // make sure the parser didn't fail
-        assertThat(mXmlDeclaredFragments).isNotEmpty();
-    }
-
-    private List<Integer> getIndexableXml() {
-        final List<Integer> xmlResSet = new ArrayList<>();
-
-        final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(
-                mContext).getSearchFeatureProvider().getSearchIndexableResources()
-                .getProviderValues();
-
-        for (SearchIndexableData bundle : bundles) {
-            Indexable.SearchIndexProvider provider = bundle.getSearchIndexProvider();
-
-            if (provider == null) {
-                continue;
-            }
-
-            List<SearchIndexableResource> resources = provider.getXmlResourcesToIndex(mContext,
-                    true);
-
-            if (resources == null) {
-                continue;
-            }
-
-            for (SearchIndexableResource resource : resources) {
-                // Add '0's anyway. It won't break the test.
-                xmlResSet.add(resource.xmlResId);
-            }
-        }
-        return xmlResSet;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index ebafceb..89be17a 100644
--- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -21,7 +21,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -143,7 +142,7 @@
         subscriptionInfoList.add(info);
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
         when(mTelephonyManager.hasIccCard()).thenReturn(true);
-        when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
+        when(mSubscriptionManager.getActiveSubscriptionInfoList())
                 .thenReturn(subscriptionInfoList);
     }
 
@@ -152,7 +151,7 @@
         SubscriptionInfo info = mock(SubscriptionInfo.class);
         subscriptionInfoList.add(info);
         when(mTelephonyManager.getSimState(anyInt())).thenReturn(SIM_STATE_READY);
-        when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
+        when(mSubscriptionManager.getActiveSubscriptionInfoList())
                 .thenReturn(subscriptionInfoList);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/ResolveInfoBuilder.java b/tests/robotests/src/com/android/settings/testutils/ResolveInfoBuilder.java
new file mode 100644
index 0000000..5eaf2a4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/ResolveInfoBuilder.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.testutils;
+
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.ProviderInfo;
+import android.content.pm.ResolveInfo;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Helper for building {@link ResolveInfo}s to be used in Robolectric tests.
+ *
+ * <p>The resulting {@link PackageInfo}s should typically be added to {@link
+ * org.robolectric.shadows.ShadowPackageManager#addResolveInfoForIntent(Intent, ResolveInfo)}.
+ */
+public final class ResolveInfoBuilder {
+
+    private final String mPackageName;
+    private ActivityInfo mActivityInfo;
+    private ProviderInfo mProviderInfo;
+
+    public ResolveInfoBuilder(String packageName) {
+        this.mPackageName = Preconditions.checkNotNull(packageName);
+    }
+
+    public ResolveInfoBuilder setActivity(String packageName, String className) {
+        mActivityInfo = new ActivityInfo();
+        mActivityInfo.packageName = packageName;
+        mActivityInfo.name = className;
+        return this;
+    }
+
+    public ResolveInfoBuilder setProvider(
+            String packageName, String className, String authority, boolean isSystemApp) {
+        mProviderInfo = new ProviderInfo();
+        mProviderInfo.authority = authority;
+        mProviderInfo.applicationInfo = new ApplicationInfo();
+        if (isSystemApp) {
+            mProviderInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
+        }
+        mProviderInfo.packageName = mPackageName;
+        mProviderInfo.applicationInfo.packageName  = mPackageName;
+        mProviderInfo.name = className;
+        return this;
+    }
+
+    public ResolveInfo build() {
+        ResolveInfo info = new ResolveInfo();
+        info.activityInfo = mActivityInfo;
+        info.resolvePackageName = mPackageName;
+        info.providerInfo = mProviderInfo;
+        return info;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index c3cdb69..f209942 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -36,7 +36,7 @@
 
     @Implementation
     public static boolean putStringForUser(ContentResolver resolver, String name, String value,
-        String tag, boolean makeDefault, int userHandle) {
+        String tag, boolean makeDefault, int userHandle, boolean overrideableByRestore) {
         final Table<Integer, String, Object> userTable = getUserTable(resolver);
         synchronized (userTable) {
             if (value != null) {
diff --git a/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java
index 120c780..72f9c62 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java
@@ -28,6 +28,7 @@
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -60,6 +61,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = ShadowSecureSettings.class)
     public void hasStyleSet_yes_shouldReturnTrue() {
         when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
@@ -71,6 +73,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = ShadowSecureSettings.class)
     public void hasStyleSet_no_shouldReturnFalse() {
         when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index d1d7885..77ef219 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -9,6 +9,7 @@
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -28,6 +29,7 @@
     }
 
     @Test
+    @Ignore
     public void testNonIndexableKeys_existInXmlLayout() {
         final List<String> niks =
             ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index d292b73..ccd6e6c 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -147,11 +147,11 @@
         final String ssidAp1 = "Test AP 1";
         final String ssidAp2 = "Test AP 2";
         List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = new ScanResult();
+        ScanResult scanResult = mock(ScanResult.class);
         scanResult.SSID = ssidAp1;
         scanResult.capabilities = "WEP";
         scanResults.add(scanResult);
-        scanResult = new ScanResult();
+        scanResult = mock(ScanResult.class);
         scanResult.SSID = ssidAp2;
         scanResult.capabilities = "WEP";
         scanResults.add(scanResult);
@@ -181,7 +181,7 @@
 
         final String ssidAp1 = "Test AP 1";
         List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = new ScanResult();
+        ScanResult scanResult = mock(ScanResult.class);
         scanResult.SSID = ssidAp1;
         scanResult.capabilities = "WEP";
         scanResults.add(scanResult);
@@ -253,7 +253,7 @@
         final String ssidAp = "Test AP ";
         final List<ScanResult> scanResults = new ArrayList<>();
         for (int i = 0; i < 7 ; i ++) {
-            ScanResult scanResult = new ScanResult();
+            ScanResult scanResult = mock(ScanResult.class);
             scanResult.SSID = ssidAp + i;
             scanResult.capabilities = "WEP";
             scanResults.add(scanResult);
@@ -273,7 +273,7 @@
         final String ssidAp = "Test AP ";
         final List<ScanResult> scanResults = new ArrayList<>();
         for (int i = 0; i < 6 ; i ++) {
-            ScanResult scanResult = new ScanResult();
+            ScanResult scanResult = mock(ScanResult.class);
             scanResult.SSID = ssidAp + i;
             scanResult.capabilities = "WEP";
             scanResults.add(scanResult);
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 cf28c9d..17f8d36 100644
--- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
@@ -23,6 +23,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiNetworkSuggestion;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.provider.Settings;
@@ -46,31 +47,32 @@
     private static final String FAKE_APP_NAME = "fake_app_name";
     private static final String FAKE_NEW_WPA_SSID = "fake_new_wpa_ssid";
     private static final String FAKE_NEW_OPEN_SSID = "fake_new_open_ssid";
+    private static final String FAKE_NEW_OPEN_SSID_WITH_QUOTE = "\"fake_new_open_ssid\"";
     private static final String FAKE_NEW_SAVED_WPA_SSID = "\"fake_new_wpa_ssid\"";
 
     private AddAppNetworksFragment mAddAppNetworksFragment;
-    private List<WifiConfiguration> mFakedSpecifiedNetworksList;
+    private List<WifiNetworkSuggestion> mFakedSpecifiedNetworksList;
     private List<WifiConfiguration> mFakeSavedNetworksList;
-    private WifiConfiguration mNewWpaConfigEntry;
-    private WifiConfiguration mNewOpenConfigEntry;
-    private WifiConfiguration mSavedWpaConfigEntry;
+    private WifiNetworkSuggestion mNewWpaSuggestionEntry;
+    private WifiNetworkSuggestion mNewOpenSuggestionEntry;
+    private WifiConfiguration mSavedWpaConfigurationEntry;
     private Bundle mBundle;
     private ArrayList<Integer> mFakedResultArrayList = new ArrayList<>();
 
     @Before
     public void setUp() {
         mAddAppNetworksFragment = spy(new AddAppNetworksFragment());
-        mNewWpaConfigEntry = generateWifiConfig(FAKE_NEW_WPA_SSID,
-                WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
-        mNewOpenConfigEntry = generateWifiConfig(FAKE_NEW_OPEN_SSID,
+        mNewWpaSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_WPA_SSID,
+                WifiConfiguration.KeyMgmt.WPA_PSK, "1234567890");
+        mNewOpenSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_OPEN_SSID,
                 WifiConfiguration.KeyMgmt.NONE, null);
-        mSavedWpaConfigEntry = generateWifiConfig(FAKE_NEW_SAVED_WPA_SSID,
+        mSavedWpaConfigurationEntry = generateRegularWifiConfiguration(FAKE_NEW_SAVED_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
     }
 
     @Test
     public void callingPackageName_onCreateView_shouldBeCorrect() {
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
 
@@ -79,7 +81,7 @@
 
     @Test
     public void launchFragment_shouldShowSaveButton() {
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
 
@@ -88,7 +90,7 @@
 
     @Test
     public void launchFragment_shouldShowCancelButton() {
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
 
@@ -97,7 +99,7 @@
 
     @Test
     public void requestOneNetwork_shouldShowCorrectSSID() {
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
         TextView ssidView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
@@ -108,7 +110,7 @@
 
     @Test
     public void withNoExtra_requestNetwork_shouldFinished() {
-        addOneSpecifiedNetworkConfig(null);
+        addOneSpecifiedRegularNetworkSuggestion(null);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
 
@@ -119,13 +121,13 @@
     public void withOneHalfSavedNetworks_uiListAndResultListShouldBeCorrect() {
         // Arrange
         // Setup a fake saved network list and assign to fragment.
-        addOneSavedNetworkConfig(mSavedWpaConfigEntry);
+        addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
         // Setup two specified networks and their results and assign to fragment.
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
-        addOneSpecifiedNetworkConfig(mNewOpenConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
         mAddAppNetworksFragment.mAllSpecifiedNetworksList = mFakedSpecifiedNetworksList;
-        mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_INITIAL);
-        mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_INITIAL);
+        mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_SUCCESS);
+        mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_SUCCESS);
         mAddAppNetworksFragment.mResultCodeArrayList = mFakedResultArrayList;
 
         // Act
@@ -136,7 +138,8 @@
         assertThat(mAddAppNetworksFragment.mResultCodeArrayList.get(0)).isEqualTo(
                 mAddAppNetworksFragment.RESULT_NETWORK_ALREADY_EXISTS);
         assertThat(mAddAppNetworksFragment.mUiToRequestedList.get(
-                0).mWifiConfiguration.SSID).isEqualTo(FAKE_NEW_OPEN_SSID);
+                0).mWifiNetworkSuggestion.wifiConfiguration.SSID).isEqualTo(
+                FAKE_NEW_OPEN_SSID_WITH_QUOTE);
     }
 
     @Test
@@ -147,13 +150,13 @@
 
     @Test
     public void getThreeNetworksNewIntent_shouldHaveThreeItemsInUiList() {
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         setupFragment();
 
         // Add two more networks and update framework bundle.
-        addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
-        addOneSpecifiedNetworkConfig(mNewOpenConfigEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
         setUpBundle(mFakedSpecifiedNetworksList);
         Bundle bundle = mAddAppNetworksFragment.getArguments();
         mAddAppNetworksFragment.createContent(bundle);
@@ -162,7 +165,7 @@
         assertThat(mAddAppNetworksFragment.mUiToRequestedList).hasSize(3);
     }
 
-    private void addOneSavedNetworkConfig(@NonNull WifiConfiguration wifiConfiguration) {
+    private void addOneSavedNetworkConfiguration(@NonNull WifiConfiguration wifiConfiguration) {
         if (mFakeSavedNetworksList == null) {
             mFakeSavedNetworksList = new ArrayList<>();
         }
@@ -170,20 +173,21 @@
         mFakeSavedNetworksList.add(wifiConfiguration);
     }
 
-    private void addOneSpecifiedNetworkConfig(@NonNull WifiConfiguration wifiConfiguration) {
-        if (wifiConfiguration != null) {
+    private void addOneSpecifiedRegularNetworkSuggestion(
+            @NonNull WifiNetworkSuggestion wifiNetworkSuggestion) {
+        if (wifiNetworkSuggestion != null) {
             if (mFakedSpecifiedNetworksList == null) {
                 mFakedSpecifiedNetworksList = new ArrayList<>();
             }
-            mFakedSpecifiedNetworksList.add(wifiConfiguration);
+            mFakedSpecifiedNetworksList.add(wifiNetworkSuggestion);
         }
     }
 
-    private void setUpBundle(List<WifiConfiguration> allFakedNetworksList) {
+    private void setUpBundle(List<WifiNetworkSuggestion> allFakedNetworksList) {
         // Set up bundle.
         final Bundle bundle = new Bundle();
         bundle.putString(AddAppNetworksActivity.KEY_CALLING_PACKAGE_NAME, FAKE_APP_NAME);
-        bundle.putParcelableArrayList(Settings.EXTRA_WIFI_CONFIGURATION_LIST,
+        bundle.putParcelableArrayList(Settings.EXTRA_WIFI_NETWORK_LIST,
                 (ArrayList<? extends Parcelable>) allFakedNetworksList);
         doReturn(bundle).when(mAddAppNetworksFragment).getArguments();
     }
@@ -192,7 +196,8 @@
         FragmentController.setupFragment(mAddAppNetworksFragment);
     }
 
-    private static WifiConfiguration generateWifiConfig(String ssid, int securityType,
+    private static WifiConfiguration generateRegularWifiConfiguration(String ssid, int
+            securityType,
             String password) {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = ssid;
@@ -203,4 +208,29 @@
         }
         return config;
     }
+
+    private static WifiNetworkSuggestion generateRegularWifiSuggestion(String ssid,
+            int securityType,
+            String password) {
+        WifiNetworkSuggestion suggestion = null;
+
+        switch (securityType) {
+            case WifiConfiguration.KeyMgmt.NONE:
+                suggestion = new WifiNetworkSuggestion.Builder()
+                        .setSsid(ssid)
+                        .build();
+                break;
+            case WifiConfiguration.KeyMgmt.WPA_PSK:
+                suggestion = new WifiNetworkSuggestion.Builder()
+                        .setSsid(ssid)
+                        .setWpa2Passphrase(password)
+                        .build();
+                break;
+            default:
+                break;
+
+        }
+
+        return suggestion;
+    }
 }
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 1eb7818..195bafc 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
@@ -20,6 +20,8 @@
 
 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.verify;
 import static org.mockito.Mockito.when;
 
@@ -57,7 +59,7 @@
 
         mContext = RuntimeEnvironment.application;
         mHandler = new ConnectToWifiHandler();
-        mWifiConfig = new WifiConfiguration();
+        mWifiConfig = spy(new WifiConfiguration());
         mWifiConfig.SSID = AP_SSID;
         doReturn(mWifiConfig).when(mAccessPoint).getConfig();
     }
@@ -97,9 +99,9 @@
     public void connect_shouldConnectToSavedSecuredNetwork() {
         when(mAccessPoint.isSaved()).thenReturn(true);
         when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        final NetworkSelectionStatus status = new NetworkSelectionStatus();
-        status.setHasEverConnected(true);
-        mWifiConfig.setNetworkSelectionStatus(status);
+        final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);
+        when(status.getHasEverConnected()).thenReturn(true);
+        when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);
 
         mHandler.connect(mContext, mAccessPoint);
 
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 1c84eb6..d40331c 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
@@ -28,6 +28,7 @@
 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;
@@ -39,7 +40,6 @@
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
 import android.os.Bundle;
 import android.os.UserHandle;
 
@@ -47,10 +47,6 @@
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.WifiTracker;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,6 +58,10 @@
 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 = {
         ShadowWifiManager.class,
@@ -205,8 +205,8 @@
     }
 
     static void setConnectionInfoSSID(String ssid) {
-        final WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(ssid));
+        final WifiInfo wifiInfo = mock(WifiInfo.class);
+        when(wifiInfo.getSSID()).thenReturn(ssid);
         ShadowWifiManager.get().setConnectionInfo(wifiInfo);
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
index f6fd660..1bdfed0 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -30,6 +30,7 @@
 import android.net.wifi.WifiManager;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -61,6 +62,7 @@
     }
 
     @Test
+    @Ignore
     public void scheduleAlarm_shouldRegisterReceiver() {
         mService.setHotspotOffReceiver(new HotspotOffReceiver(mAppContext));
 
@@ -78,6 +80,7 @@
     }
 
     @Test
+    @Ignore
     public void cancelAlarmIfNecessary_hasActiveTethers_shouldNotUnregisterReceiver() {
         mService.scheduleAlarm();
         final ArrayList<Integer> tethers = new ArrayList<>();
@@ -89,6 +92,7 @@
     }
 
     @Test
+    @Ignore
     public void cancelAlarmIfNecessary_noActiveTethers_shouldUnregisterReceiver() {
         final ArrayList<Integer> tethers = new ArrayList<>();
         ReflectionHelpers.setField(mService, "mCurrentTethers", tethers);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index 902249e..bf2261a 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -66,7 +66,7 @@
         MockitoAnnotations.initMocks(this);
         mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
         mConfig = new SoftApConfiguration.Builder().setSsid("test_1234")
-                .setWpa2Passphrase("test_password").build();
+                .setPassphrase("test_password", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig);
@@ -83,8 +83,8 @@
     public void displayPreference_shouldStylePreference() {
         mController.displayPreference(mScreen);
 
-        assertThat(mPreference.getText()).isEqualTo(mConfig.getWpa2Passphrase());
-        assertThat(mPreference.getSummary()).isEqualTo(mConfig.getWpa2Passphrase());
+        assertThat(mPreference.getText()).isEqualTo(mConfig.getPassphrase());
+        assertThat(mPreference.getSummary()).isEqualTo(mConfig.getPassphrase());
     }
 
     @Test
@@ -111,14 +111,14 @@
 
         // Create a new config using different password
         final SoftApConfiguration config = new SoftApConfiguration.Builder()
-                .setWpa2Passphrase(VALID_PASS2).build();
+                .setPassphrase(VALID_PASS2, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
 
         // Call updateDisplay and verify it's changed.
         mController.updateDisplay();
         assertThat(mController.getPasswordValidated(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK))
-                .isEqualTo(config.getWpa2Passphrase());
-        assertThat(mPreference.getSummary()).isEqualTo(config.getWpa2Passphrase());
+                .isEqualTo(config.getPassphrase());
+        assertThat(mPreference.getSummary()).isEqualTo(config.getPassphrase());
     }
 
     @Test
@@ -131,7 +131,7 @@
 
         // Create a new config using different password
         final SoftApConfiguration config = new SoftApConfiguration.Builder()
-                .setWpa2Passphrase(VALID_PASS2).build();
+                .setPassphrase(VALID_PASS2, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
 
         // Call updateDisplay and verify it's changed.
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
index c0c1dde..fc38088 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -124,7 +124,8 @@
     public void displayPreference_wifiApDisabled_shouldHideQrCodeIcon() {
         when(mWifiManager.isWifiApEnabled()).thenReturn(false);
         final SoftApConfiguration config = new SoftApConfiguration.Builder()
-                .setSsid("test_1234").setWpa2Passphrase("test_password").build();
+                .setSsid("test_1234").setPassphrase("test_password",
+                SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
 
         mController.displayPreference(mScreen);
@@ -135,7 +136,8 @@
     public void displayPreference_wifiApEnabled_shouldShowQrCodeIcon() {
         when(mWifiManager.isWifiApEnabled()).thenReturn(true);
         final SoftApConfiguration config = new SoftApConfiguration.Builder()
-                .setSsid("test_1234").setWpa2Passphrase("test_password").build();
+                .setSsid("test_1234").setPassphrase("test_password",
+                SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
 
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
index 5ad94cb..0b066cd 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
@@ -15,6 +15,7 @@
 import androidx.preference.PreferenceScreen;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -45,7 +46,8 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mConfig = new SoftApConfiguration.Builder().setSsid("test_1234")
-                .setWpa2Passphrase("test_password").build();
+                .setPassphrase("test_password",
+                SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         mContext = spy(RuntimeEnvironment.application);
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
@@ -74,6 +76,7 @@
     }
 
     @Test
+    @Ignore
     public void updateDisplay_preferenceUpdated() {
         // test defaulting to WPA2-Personal on new config
         when(mWifiManager.getSoftApConfiguration()).thenReturn(null);
@@ -84,7 +87,7 @@
 
         // test open tether network
         SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
-                .setWpa2Passphrase(null).build();
+                .setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
         mController.updateDisplay();
         assertThat(mController.getSecurityType()).isEqualTo(
@@ -93,7 +96,8 @@
 
         // test WPA2-Personal tether network
         SoftApConfiguration config2 = new SoftApConfiguration.Builder(mConfig)
-                .setWpa2Passphrase("test_password").build();
+                .setPassphrase("test_password",
+                SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(config2);
         mController.updateDisplay();
         assertThat(mController.getSecurityType()).isEqualTo(
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
index d068ce0..4ebfef7 100644
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -15,7 +15,6 @@
  */
 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;
@@ -28,9 +27,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -39,9 +36,9 @@
 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.net.wifi.WifiSsid;
 import android.provider.Settings;
 
 import androidx.fragment.app.Fragment;
@@ -60,13 +57,13 @@
 import com.google.common.collect.Lists;
 
 import org.junit.Before;
-import org.junit.Ignore;
 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)
@@ -129,11 +126,12 @@
         config.SSID = TEST_SSID;
         config.BSSID = TEST_BSSID;
         config.networkId = TEST_NETWORK_ID;
-        WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
-        wifiInfo.setBSSID(TEST_BSSID);
-        wifiInfo.setRssi(TEST_RSSI);
-        wifiInfo.setNetworkId(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);
@@ -294,19 +292,20 @@
         config.networkId = TEST_NETWORK_ID;
         config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
 
-        WifiConfiguration.NetworkSelectionStatus selectionStatus =
-                new WifiConfiguration.NetworkSelectionStatus();
-        selectionStatus.setNetworkSelectionDisableReason(
-                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
-        selectionStatus.setNetworkSelectionStatus(
-                WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);
+        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();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
-        wifiInfo.setBSSID(TEST_BSSID);
-        wifiInfo.setRssi(TEST_RSSI);
-        wifiInfo.setNetworkId(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();
         AccessPoint accessPoint = new AccessPoint(mContext, config);
         accessPoint.update(config, wifiInfo, null);
 
@@ -315,12 +314,11 @@
         assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
         assertThat(accessPoint.isActive()).isFalse();
         assertThat(accessPoint.getConfig()).isNotNull();
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                accessPoint.getConfig().getNetworkSelectionStatus();
+        NetworkSelectionStatus networkStatus = accessPoint.getConfig().getNetworkSelectionStatus();
         assertThat(networkStatus).isNotNull();
         assertThat(networkStatus.isNetworkEnabled()).isFalse();
         assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(
-                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
+                NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
 
         when(mWifiTracker.getAccessPoints()).thenReturn(Lists.newArrayList(accessPoint));
         launchActivity(WifiSettings.EXTRA_START_CONNECT_SSID, accessPoint.getSsidStr());
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
index fe21596..fec0c6f 100644
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
@@ -23,9 +23,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.content.Intent;
@@ -35,7 +33,6 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
 import android.provider.Settings;
 
 import androidx.fragment.app.Fragment;
@@ -45,19 +42,18 @@
 
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTracker.WifiListener;
 import com.android.settingslib.wifi.WifiTrackerFactory;
 
 import com.google.common.collect.Lists;
 
 import org.junit.Before;
-import org.junit.Ignore;
 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)
@@ -136,11 +132,12 @@
         config.BSSID = TEST_BSSID;
         config.networkId = TEST_NETWORK_ID;
         config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-        final WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
-        wifiInfo.setBSSID(TEST_BSSID);
-        wifiInfo.setRssi(TEST_RSSI);
-        wifiInfo.setNetworkId(TEST_NETWORK_ID);
+        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);