diff --git a/Android.bp b/Android.bp
index 5470e70..2d4c42c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "packages_apps_Settings_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 java_library {
     name: "settings-logtags",
     srcs: ["src/**/*.logtags"],
@@ -93,3 +110,21 @@
     name: "contextualcards",
     aars: ["libs/contextualcards.aar"],
 }
+
+filegroup {
+    name: "Settings_proguard_flags",
+    srcs: ["proguard.flags"],
+}
+
+// The sources for Settings need to be exposed to SettingsGoogle, etc.
+// so they can run the com.android.settingslib.search.IndexableProcessor
+// over all the sources together.
+filegroup {
+    name: "Settings_srcs",
+    srcs: ["src/**/*.java"],
+}
+
+filegroup {
+    name: "Settings_manifest",
+    srcs: ["AndroidManifest.xml"],
+}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cfda9b7..86d7992 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1272,6 +1272,7 @@
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
             android:exported="true"
+            android:theme="@style/Theme.SubSettings"
             android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
@@ -1315,7 +1316,7 @@
         </activity>
         <activity
             android:name="Settings$ScanningSettingsActivity"
-            android:label="@string/location_scanning_screen_title"
+            android:label="@string/location_services_screen_title"
             android:icon="@drawable/ic_homepage_location"
             android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
@@ -1324,7 +1325,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.location.ScanningSettings" />
+                android:value="com.android.settings.location.LocationServices" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -3065,6 +3066,33 @@
         </activity>
 
         <activity
+            android:name="Settings$AlarmsAndRemindersActivity"
+            android:exported="true"
+            android:label="@string/alarms_and_reminders_label">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
+                <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$AlarmsAndRemindersAppActivity"
+            android:exported="true"
+            android:label="@string/alarms_and_reminders_label">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
+                <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.AlarmsAndRemindersDetails" />
+        </activity>
+
+        <activity
             android:name="Settings$ManageExternalSourcesActivity"
             android:exported="true"
             android:label="@string/install_other_apps">
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 4aa67ab..b94da0d 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2997,6 +2997,54 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;path"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="25"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="C6.67,19.26,7.26,18.67,8,18.67z&quot; />"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="32"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:pathData=&quot;M16,12h1.33c0.74,0,1.33,0.6,1.33,1.33v12c0,0.74-0.6,1.33-1.33,1.33H16c-0.74,0-1.33-0.6-1.33-1.33v-12"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="35"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                    android:color=&quot;@color/notification_block_color&quot;/>"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -3525,27 +3573,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
-        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-en-rXC/strings.xml"
-            line="2816"
-            column="170"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3561,7 +3593,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3577,7 +3609,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3593,7 +3625,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3605,11 +3637,27 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
+        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="2821"
+            column="170"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>Welcome to Google sync!&lt;/font>"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6537"
+            line="6543"
             column="36"/>
     </issue>
 
@@ -3641,7 +3689,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="434"
+            line="435"
             column="44"/>
     </issue>
 
@@ -3657,7 +3705,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="440"
+            line="441"
             column="44"/>
     </issue>
 
@@ -3673,7 +3721,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="441"
+            line="442"
             column="44"/>
     </issue>
 
@@ -3689,7 +3737,7 @@
         errorLine2="                                 ^">
         <location
             file="res/values/styles.xml"
-            line="477"
+            line="478"
             column="34"/>
     </issue>
 
@@ -3801,7 +3849,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes.xml"
-            line="273"
+            line="272"
             column="42"/>
     </issue>
 
@@ -3913,7 +3961,7 @@
         errorLine2="                                          ^">
         <location
             file="res/values/themes_suw.xml"
-            line="188"
+            line="196"
             column="43"/>
     </issue>
 
@@ -3929,7 +3977,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes_suw.xml"
-            line="189"
+            line="197"
             column="42"/>
     </issue>
 
@@ -3945,7 +3993,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes_suw.xml"
-            line="190"
+            line="198"
             column="45"/>
     </issue>
 
diff --git a/protos/Android.bp b/protos/Android.bp
index 5184218..e09b941 100644
--- a/protos/Android.bp
+++ b/protos/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 java_library_static {
     name: "settings-contextual-card-protos-lite",
     host_supported: true,
@@ -14,4 +23,4 @@
         type: "lite",
     },
     srcs: ["settings_log_bridge.proto"],
-}
\ No newline at end of file
+}
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 59cb6dd..6b3220b 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -134,6 +134,11 @@
                 android:text="@string/accessibility_dialog_button_deny"
                 style="@style/AccessibilityDialogButton" />
 
+            <Button
+                android:id="@+id/permission_enable_uninstall_button"
+                android:text="@string/uninstall_text"
+                android:visibility="gone"
+                style="@style/AccessibilityDialogButton" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/res/layout/preference_widget_dialog_summary.xml b/res/layout/preference_widget_dialog_summary.xml
index 2978efb..e37be71 100644
--- a/res/layout/preference_widget_dialog_summary.xml
+++ b/res/layout/preference_widget_dialog_summary.xml
@@ -18,7 +18,6 @@
 
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:text="@string/bluetooth_select_a2dp_codec_type_help_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/developer_option_dialog_margin_top"
diff --git a/res/layout/udfps_enroll_enrolling.xml b/res/layout/udfps_enroll_enrolling.xml
index 03b6528..6b3382c 100644
--- a/res/layout/udfps_enroll_enrolling.xml
+++ b/res/layout/udfps_enroll_enrolling.xml
@@ -20,7 +20,47 @@
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout="@layout/sud_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/sud_layout_description"
+                style="@style/SudDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minLines="3"
+                android:text="@string/security_settings_fingerprint_enroll_start_message" />
+
+            <TextView
+                android:id="@+id/repeat_message"
+                style="@style/SudDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+                android:visibility="invisible" />
+
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/error_text"
+            style="@style/TextAppearance.ErrorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:accessibilityLiveRegion="polite"
+            android:gravity="center_horizontal"
+            android:visibility="invisible" />
+    </LinearLayout>
+
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/udfps_enroll_layout.xml b/res/layout/udfps_enroll_layout.xml
deleted file mode 100644
index 8338589..0000000
--- a/res/layout/udfps_enroll_layout.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    style="?attr/fingerprint_layout_theme"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/sud_layout_icon"
-        style="@style/SudGlifIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="?attr/sudGlifHeaderGravity"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:src="@drawable/ic_fingerprint_header" />
-
-    <TextView
-        android:id="@+id/suc_layout_title"
-        style="@style/SudGlifHeaderTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp" />
-
-    <FrameLayout
-        android:id="@+id/description_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/sud_layout_description"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/security_settings_fingerprint_enroll_start_message" />
-
-        <TextView
-            android:id="@+id/repeat_message"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/security_settings_fingerprint_enroll_repeat_message"
-            android:visibility="invisible" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/error_text"
-        style="@style/TextAppearance.ErrorText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginBottom="16dp"
-        android:accessibilityLiveRegion="polite"
-        android:gravity="center_horizontal"
-        android:paddingEnd="5dp"
-        android:paddingStart="5dp"
-        android:visibility="invisible" />
-</com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout>
diff --git a/res/layout/wifi_calling_settings_preferences.xml b/res/layout/wifi_calling_settings_preferences.xml
index 7e411e1..98acd95 100644
--- a/res/layout/wifi_calling_settings_preferences.xml
+++ b/res/layout/wifi_calling_settings_preferences.xml
@@ -21,11 +21,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.android.settings.widget.SwitchBar
+    <com.android.settings.widget.SettingsMainSwitchBar
         android:id="@+id/switch_bar"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_width="match_parent"
-        android:theme="?attr/switchBarTheme" />
+        android:title="@string/wifi_calling_main_switch_title"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" />
 
     <FrameLayout
         android:id="@android:id/tabcontent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 581f3cd..452222f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ander gebruikers"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Toestelberging"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Draagbare berging"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> gebruik van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"gebruik van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Geen programme het onlangs toegang tot jou ligging gekry nie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoë batterygebruik"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lae batterygebruik"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi- en Bluetooth-skandering"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-opsporing"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Laat programme en dienste toe om enige tyd na Wi-Fi-netwerke te soek, selfs wanneer Wi-Fi af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-opsporing"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Laat programme en dienste toe om enige tyd na toestelle in die omtrek te soek, selfs wanneer Bluetooth af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Liggingdienste vir werk"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Liggingtydsonebespeuring"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Liggingtydsonebespeuring"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Verander lettergrootte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skermlesers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Oudio en teks op skerm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Onderskrifte"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Oudio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Vertoon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks en skerm"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Maak skerm donkerder"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rooi-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rooi-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blou-geel"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Verminder helderheid"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Maak skerm donkerder as jou foon se minimum helderheid"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Maak skerm donkerder as jou tablet se minimum helderheid"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Maak jou skerm donkerder sodat dit geriefliker is om te lees.&lt;br/&gt;&lt;br/&gt; Dit kan nuttig wees wanneer: &lt;ol&gt; &lt;li&gt; Jou foon se verstek- minimum helderheid steeds te helder is&lt;/li&gt; &lt;li&gt; Jy jou foon in donker situasies gebruik, soos snags of in \'n donker vertrek voor slaaptyd&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Luitone"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ander klanke en vibrasies"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Kennisgewings"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Gesprek"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Onlangs gestuur"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Sien alles van afgelope 7 dae"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Gevorderd"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Algemeen"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Werkkennisgewings"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Aanpasbare kennisgewings"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Aanpasbare kennisgewingprioriteit"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wys op aftrekskerm, statusbalk en sluitskerm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Versteek stil kennisgewings in statusbalk"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Flikkerende lig"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kennisgewings op sluitskerm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privaatheid"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Slaan sluitskerm oor"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gaan ná gesigslot direk na skerm toe wat laas gebruik is"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sluitskerm, sluit skerm, slaan oor, systap"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Gesprekkennisgewings"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Opletkennisgewings"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Stil kennisgewings"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Programme wat nie na hierdie luisteraar oorbrug is nie"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alle programme is oorbrug"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d programme is nie oorbrug nie</item>
+      <item quantity="one">%d program is nie oorbrug nie</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Oorbrugde programme"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Geen geïnstalleerde programme het versoek om as VR-helperdienste te werk nie."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Gee <xliff:g id="SERVICE">%1$s</xliff:g> toegang tot VR-diens?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Diensverskaffer se datarekening kan van toestel se rekening verskil"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit wat deur diensverskaffernetwerke gebruik word"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sluit data uit wat deur diensverskaffernetwerke gebruik word"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stel datawaarskuwing"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarskuwing"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Verander die netwerkbedryfsmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Voorkeurnetwerktipe"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Diensverskaffer"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Instellings-weergawe"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Oproepe"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Diensverskaffervideo-oproepe"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Stelselkeuse"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwyder die SIM en voeg dit weer in. Herbegin jou toestel as die probleem voortduur."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer weer om die SIM aan te skakel. Herbegin jou toestel as die probleem voortduur."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Diensverskafferoorskakeling"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is aktief"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om SIM-instellings op te dateer"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Gewissel na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie beskikbaar nie"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tydelik nie beskikbaar nie"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen SIM nie"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeure"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeure"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koppel aan publieke netwerke"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, sellulêr, mobiel, selfoondiensverskaffer, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Bekyk vliegtuigmodusnetwerke"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Stel konnektiwiteit reg"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Vliegtuigmodusnetwerke is beskikbaar"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ontkoppel Ethernet om netwerke te wissel"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan nie netwerke oorskakel terwyl dit gekoppel is nie"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Vliegtuigmodusnetwerke"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Gekoppel"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Voer foonnommer in"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Foonnommer ontbreek."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Laat 2G toe"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9c44774..bbb9848 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"በማያ ገጽ ላይ ያለውን ጽሑፍ ያሳንሱ ወይም ያተልቁ።"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"አነስ አድርግ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ተለቅ አድርግ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ራስ-አዙር ይጠቀሙ"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"መልክ ላይ የተመሰረተው ራስ-አዙር በማያ ገጹ ላይ የሆነ ሰው እያየ መሆኑን እና እንዴት እያየ እንደሆነ ለመመልከት የፊት ካሜራውን ይጠቀማል። ተኝተው እያሉ ለማንበብ ይፈቅዳል እንዲሁም ምስሎች በጭራሽ አይከማቹም ወይም ወደ Google አይላኩም።&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lየበለጠ ለመረዳትlt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"የናሙና ጽሑፍ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"አስደናቂው የኦዝ ምትሃተኛ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ምዕራፍ 11፦ ኦዝ፣ አስደናቂዋ የኤምራልድ ከተማ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ፍለጋ"</string>
     <string name="display_settings" msgid="7197750639709493852">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ማያ በራስ ሰር አሽከርክር"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"አጥፋ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"አብራ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"በርቷል - መልክ ላይ የተመሠረተ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"መልክ ማወቅ አንቃ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ቀለማት"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ተፈጥሯዊ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ተጨምሯል"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ሌሎች ተጠቃሚዎች"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"የመሣሪያ ማከማቻ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ተንቀሳቃሽ ማከማቻ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ከ<xliff:g id="TOTAL">%2$s</xliff:g> ጥቅም ላይ የዋለ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ከ<xliff:g id="TOTAL">%1$s</xliff:g> ጥቅም ላይ የዋለ"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ምንም መተግበሪያዎች በቅርቡ መገኛ አካባቢን አልደረሱም"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ከፍተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ዝቅተኛ የባትሪ አጠቃቀም"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"የWi‑Fi እና ብሉቱዝ መቃኘት"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi ቅኝት"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ የWi-Fi አውታረ መረቦችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"የBluetooth ቅኝት"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"የአካባቢ አገልግሎቶች ለስራ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ይህን መሣሪያ ከእርስዎ ፍላጎቶች ጋር እንዲጣጣም ማበጀት ይችላሉ። እነዚህ የተደራሽነት ባህሪያት በኋላ ላይ በቅንብሮች ውስጥ ሊቀየሩ ይችላሉ።"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"የማያ ገጽ አንባቢዎች"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"መግለጫ ጽሑፎች"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ኦዲዮ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"አሳይ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ጽሁፍ እና ማሳያ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ማያ ገጹን ወደ ጥቁር ይቀይሩ"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ሰማያዊ-ቢጫ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ብሩህነትን ይቀንሱ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ከስልክዎ አነስተኛ ብሩህነት የበለጠ ማያ ጨለማ ያድርጉ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ከጡባዊዎ አነስተኛ ብሩህነት የበለጠ ማያ ጨለማ ያድርጉ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ለማንበብ የበለጠ ምቾት እንዲኖርዎ ማያ ገጽዎን የበለጠ ጥቁር ያድርጉት።&lt;br/&gt;&lt;br/&gt; ይህ ጠቃሚ ሊሆን የሚችለው፦ &lt;ol&gt; &lt;li&gt; የስልክዎ ነባሪ ዝቅተኛ ብሩህነት አሁንም በጣም ብሩህ ሲሆን&lt;/li&gt; &lt;li&gt; ስልክዎን በጨለማ ሁኔታዎች ውስጥ ይጠቀማሉ፣ ለምሳሌ ማታ ወይም በጨለማ ክፍል ውስጥ ከመተኛትዎ በፊት&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"የስልክ ጥሪ ድምፆች"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ሌሎች ድምጾች እና ንዝረቶች"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ማሳወቂያዎች"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ውይይት"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"በቅርቡ የተላኩ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ካለፉት 7 ቀናት ወዲህ ያሉትን በሙሉ ይመልከቱ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"የላቀ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ጠቅላላ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"የስራ ማሳወቂያዎች"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"እንደሁኔታው ተስማሚ ማሳወቂያዎች"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ተስማሚ የማሳወቂያ ቅድሚያ ተሰጪ"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"በታች ተጎታች ጥላ ውስጥ፣ በሁኔታ አሞሌ እና በማያ ገጽ ቁልፍ ላይ አሳይ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"በሁኔታ አሞሌ ላይ ጸጥ ያሉ ማሳወቂያዎችን ደብቅ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ብርሃን አብለጭለጭ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"በማያ ገጽ ቁልፍ ላይ ማሳወቂያዎች"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ግላዊነት"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"የማያ ገጽ ቁልፍን ይዝለሉ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ከፊት መክፈት በኋላ በቀጥታ መጨረሻ ላይ ስራ ላይ ወደዋለው ማያ ገጽ ይሂዱ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"የማያ ገጽ ቁልፍ፣ የማያ ገጽ ቁልፍ፣ ዝለል፣ እለፍ"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"የውይይት ማሳወቂያዎች"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"የማንቂያ ማሳወቂያዎች"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ጸጥ ያሉ ማሳወቂያዎች"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ከዚህ አዳማጭ ጋር በድልድይ ያልተገናኙ መተግበሪያዎች"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ሁሉም መተግበሪያዎች በድልድይ ተገናኝተዋል"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d መተግበሪያዎች በድልድይ አልተገናኙም</item>
+      <item quantity="other">%d መተግበሪያዎች በድልድይ አልተገናኙም</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"በድልድይ የተገናኙ መተግበሪያዎች"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"የምናባዊ ዕውነታ አጋዥ አገልግሎቶች"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ምንም የተጫኑ መተግበሪያዎች እንደ የምናባዊ ዕውነታ አጋዥ አገልግሎቶች ሆነው እንዲሄዱ አልጠየቁም።"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ለ<xliff:g id="SERVICE">%1$s</xliff:g> የምናባዊ ዕውነታ መዳረሻ ይፈቀድለት?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ገደቦች</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"የአገልግሎት አቅራቢ ውሂብ የሂሳብ አከፋፈል ከመሳሪያ የሂሳብ አከፋፈል የተለየ ሊሆን ይችላል"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"የአገልግሎት አቅራቢ አውታረ መረቦች የሚጠቀሙበትን ውሂብ አያካትትም"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"የአገልግሎት አቅራቢ አውታረ መረቦች የሚጠቀሙበትን ውሂብ አያካትትም"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ ውሏል"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"የውሂብ ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_warning" msgid="2925054658166062884">"የውሂብ ማስጠንቀቂያ"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"የአውታረ መረቡን የክወና ሁነታን ለውጥ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"የሚመረጠው የአውታረ መረብ አይነት"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"አገልግሎት አቅራቢ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"የቅንብሮች ስሪት"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"በመደወል ላይ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"የአገልግሎት አቅራቢ የቪዲዮ ጥሪ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"የሥርዓት ምርጫ"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ሲሙን ያስወጡትና እንደገና ያስገቡት። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ሲሙን እንደገና ለማብራት ይሞክሩ። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"አውታረ መረብን ማግበር"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"የአገልግሎት አቅራቢን መቀየር"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ገቢር ነው"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"የሲም ቅንብሮችን ለማዘመን መታ ያድርጉ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ተቀይሯል"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"አይገኝም"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ለጊዜው አይገኝም"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM የለም"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ምርጫዎች"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"የአውታረ መረብ ምርጫዎች"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ከይፋዊ አውታረ መረቦች ጋር አገናኝ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"የአውታረ መረብ ግንኙነት በይነመረብ፣ ገመድ-አልባ፣ ውሂብ፣ wifi፣ wi-fi፣ wi fi፣ ተንቀሳቃሽ ስልክ፣ ሞባይል፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte፣ ኤልቲኢ"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"የአውሮፕላን ሁነታ አውታረመረቦችን ይመልከቱ"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ግንኙነትን ያስተካክሉ"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"የአውሮፕላን ሁነታ አውታረ መረቦች ይገኛሉ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"አውታረ መረቦችን ለመቀየር፣ የኢተርኔት ግንኙነት ያቋርጡ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"በሚገናኙበት ጊዜ አውታረ መረቦችን መቀየር አይቻልም"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"የአውሮፕላን ሁነታ አውታረ መረቦች"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ተገናኝቷል"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"የስልክ ቁጥር ያስገቡ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"የስልክ ቁጥር ይቀራል።"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"እሺ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2ጂ ይፍቀዱ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3e952d7..78abed5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -56,10 +56,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"يمكنك تصغير النص الظاهر على الشاشة أو تكبيره."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"تصغير"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"تكبير"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"استخدام \"التدوير التلقائي\""</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"‏ميزة التدوير التلقائي المستندة إلى الوجه تستخدم الكاميرا الأمامية لمعرفة ما إذا كان هناك شخص ينظر إلى الشاشة وكيف ينظر إليها. وتتيح هذه الميزة القراءة أثناء الاستلقاء ولا يتم مطلقًا تخزين الصور أو إرسالها إلى Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;مزيد من المعلومات&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نموذج نص"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ساحر أوز العجيب"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"الفصل ۱۱: مدينة أوز الزمردية العجيبة"</string>
@@ -1256,14 +1254,10 @@
     <string name="search_settings" msgid="7573686516434589771">"بحث"</string>
     <string name="display_settings" msgid="7197750639709493852">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"التدوير التلقائي للشاشة"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"إيقاف"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"تفعيل"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"تفعيل - استنادًا للوجه"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"تفعيل تقنية \"التعرّف على الوجوه\""</string>
     <string name="color_mode_title" msgid="8666690832113906028">"الألوان"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبيعية"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"مُحسنة"</string>
@@ -1562,6 +1556,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"مستخدمون آخرون"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"مساحة التخزين للجهاز"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"وحدة تخزين محمولة"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"تم استخدام <xliff:g id="USED">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1827,11 +1831,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"لم يصل أي تطبيق إلى بيانات الموقع الجغرافي مؤخرًا."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"استخدام عالٍ للبطارية"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"استخدام منخفض للبطارية"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏البحث عن Wi‑Fi وبلوتوث"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏البحث عن شبكات Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف Wi‑Fi. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"البحث عن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات الموقع الجغرافي للعمل"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
@@ -2240,7 +2245,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"يمكنك تخصيص هذا الجهاز ليتوافق مع احتياجاتك. ويمكن تغيير ميزات \"سهولة الاستخدام\" هذه لاحقًا من خلال الإعدادات."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"تغيير حجم الخط"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"أجهزة قارئ الشاشة"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"الصوت والنص على الشاشة"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"الشرح"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"الصوت"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"العرض"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"النص وشاشة العرض"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"جعل الشاشة أقل سطوعًا"</string>
@@ -2397,7 +2405,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"الأزرق والأصفر"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"تقليل السطوع"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"يمكنك ضبط درجة سطوع الشاشة على مستوى أقل من الحد الأدنى لسطوع هاتفك."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"يمكنك ضبط درجة سطوع الشاشة على مستوى أقل من الحد الأدنى لسطوع جهازك اللوحي."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏يمكنك تقليل درجة سطوع الشاشة لتصبح أنسب للقراءة.&lt;br/&gt;&lt;br/&gt; يمكن الاستفادة من هذه الميزة عندما: &lt;ol&gt; &lt;li&gt; تكون أقلّ درجة سطوع تلقائية في هاتفك غير كافية&lt;/li&gt; &lt;li&gt; تستخدم هاتفك في الظلام، مثلاً عندما تستخدمه ليلاً أو في غرفة مظلمة قبل النوم&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3680,9 +3689,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"نغمات الرنين"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"الأصوات والاهتزازات الأخرى"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"الإشعارات"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"محادثة"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"تم إرسالها مؤخرًا"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"عرض كل التطبيقات من آخر ٧ أيام"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"إعدادات متقدّمة"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"عام"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"إشعارات العمل"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"الإشعارات التكيّفية"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"أولوية الإشعارات التكيّفية"</string>
@@ -3744,7 +3754,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"يظهر في خيار منسدل وفي شريط الحالة وفي شاشة القفل"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"إخفاء الإشعارات الصامتة في شريط الحالة"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"وميض الضوء"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"الإشعارات على شاشة القفل"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"الخصوصية"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"تخطي شاشة القفل"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"بعد فتح القفل بالوجه، انتقِل مباشرة إلى آخر شاشة مُستخدَمة."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"شاشة القفل، شاشة القفل، التخطي، التجاوز"</string>
@@ -3872,13 +3882,17 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"إشعارات المحادثات"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"إشعارات التنبيه"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"الإشعارات الصامتة"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"التطبيقات التي لا يمكن لهذا المستمع تلقّي إشعارتها."</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"كل التطبيقات يمكن تلقّي إشعاراتها."</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="zero">‏لا يتم تلقّي إشعارات من %d تطبيق.</item>
+      <item quantity="two">‏لا يتم تلقّي إشعارات من تطبيقين (%d).</item>
+      <item quantity="few">‏لا يتم تلقّي إشعارات من %d تطبيقات.</item>
+      <item quantity="many">‏لا يتم تلقّي إشعارات من %d تطبيقًا.</item>
+      <item quantity="other">‏لا يتم تلقّي إشعارات من %d تطبيق.</item>
+      <item quantity="one">‏لا يتم تلقّي إشعارات من تطبيق واحد (%d).</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"التطبيقات التي يمكن تلقّي إشعاراتها"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"خدمات مساعد الواقع الافتراضي"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"لم تطلب أي تطبيقات مثبَّتة أن يتم تشغيلها كخدمات مساعد واقع افتراضي."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"هل تريد السماح لخدمة <xliff:g id="SERVICE">%1$s</xliff:g> بالوصول إلى خدمة الواقع الافتراضي؟"</string>
@@ -4616,7 +4630,7 @@
       <item quantity="one">قيد واحد</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"قد تختلف طريقة احتساب بيانات مشغِّل شبكة الجوّال عن طريقة الاحتساب على الجهاز."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"استبعاد البيانات التي تستخدمها شبكات مشغّلي شبكات الجوّال"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"تم استبعاد البيانات التي تستخدمها شبكات مشغِّلي شبكات الجوّال"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدَمة"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ضبط تحذيرات استخدام البيانات"</string>
     <string name="data_warning" msgid="2925054658166062884">"تحذيرات البيانات"</string>
@@ -5216,7 +5230,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"تغيير وضع تشغيل الشبكة"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"نوع الشبكة المفضّل"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"مشغّل شبكة جوّال"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"إصدار الإعدادات"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"الاتصال"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"مكالمة فيديو باستخدام مشغّل شبكة الجوال"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"اختيار النظام"</string>
@@ -5265,6 +5280,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏يجب إزالة شريحة SIM ثم إدخالها مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏حاوِل تفعيل شريحة SIM مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"تفعيل الشبكة"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"جارٍ تبديل مشغِّل شبكة الجوّال"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"مشغّل شبكة الجوّال <xliff:g id="CARRIER_NAME">%1$s</xliff:g> مفعّل"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏انقر لتعديل إعدادات شريحة SIM."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"تم التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
@@ -5448,7 +5464,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"غير متاحة"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"غير متاح مؤقتًا"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏بلا شريحة SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"التفضيلات"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"الإعدادات المفضَّلة للشبكة"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‏الاتصال بشبكات Wi-Fi عامة"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏الاتصال بالشبكة، الإنترنت، لاسلكي، بيانات، wifi، wi-fi، wi fi، خلوي، جهاز جوّال، مشغل شبكة الجوال، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"عرض الشبكات المتاحة في وضع الطيران"</string>
@@ -5462,7 +5478,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"حل مشكلة اتصال البيانات"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"الشبكات متاحة في وضع الطيران."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"للتبديل بين الشبكات، يجب فصل إيثرنت."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"لا يمكن التبديل بين الشبكات أثناء الاتصال بشبكة إيثرنت."</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"الشبكات المتاحة في وضع الطيران"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصلة بالإنترنت"</string>
@@ -5497,4 +5512,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"إدخال رقم الهاتف"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"رقم الهاتف مفقود."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"حسنًا"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"السماح بشبكة الجيل الثاني"</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 87e56d5..021a1b7 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"স্ক্ৰীণৰ আখৰ সৰু বা ডাঙৰ কৰক।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"সৰু কৰক"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ডাঙৰ কৰক"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"স্বয়ং-ঘূৰ্ণনৰ সুবিধা ব্যৱহাৰ কৰক"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"মুখাৱয়ব ভিত্তিক স্বয়ং-ঘূৰ্ণনৰ সুবিধাই কোনোবাই স্ক্ৰীনখনলৈ চাই আছে নেকি আৰু কেনেকৈ চাই আছে জানিবলৈ সন্মুখৰ কেমেৰা ব্যৱহাৰ কৰে। ই বিছনাত পৰি থাকোঁতে পঢ়াৰ সুবিধা দিয়ে আৰু প্ৰতিচ্ছবিসমূহ কেতিয়াও ষ্ট’ৰ কৰা নহয় অথবা Googleলৈ পঠিওৱা নহয়।&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;অধিক জানক&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"পাঠৰ নমুনা"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ যাদুকৰ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"অধ্যায় ১১: অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ পান্নাৰ মহানগৰ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ডিছপ্লে’"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"স্বয়ং-ঘূৰ্ণন স্ক্ৰীণ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"অফ কৰা আছে"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"অন কৰা আছে"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"অন আছে - মুখাৱয়ব ভিত্তিক"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"মুখাৱয়ব চিনাক্তকৰণ সক্ষম কৰক"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ৰংবোৰ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"প্ৰাকৃতিক"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"বৃদ্ধি কৰা হ’ল"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"অন্য ব্যৱহাৰকাৰীসকল"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইচৰ সঞ্চয়াগাৰ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"প\'ৰ্টেবল সঞ্চয়াগাৰ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>ৰ ভিতৰত <xliff:g id="USED">%1$s</xliff:g> ব্যৱহৃত হৈছে"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>ৰ ব্যৱহৃত"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"শেহতীয়াকৈ কোনো এপে অৱস্থান এক্সেছ কৰা নাই"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"অত্যাধিক বেটাৰি ব্যৱহাৰ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"বেটাৰিৰ কম ব্যৱহাৰ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ৱাই-ফাই আৰু ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ৱাই-ফাই স্কেনিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ৱাই-ফাই অফ থকা অৱস্থাতো এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত ৱাই-ফাই নেটৱৰ্কবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ অফ থকা অৱস্থাতও এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কৰ্মস্থানৰ বাবে অৱস্থান সেৱা"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"আপুনি আপোনাৰ প্ৰয়োজনীতাসমূহৰ সৈতে মিলাকৈ এই ডিভাইচটো কাষ্টমাইজ কৰিব পাৰে। এই সাধ্য সুবিধাসমূহ পিছত ছেটিংসমূহ-লৈ গৈ সলনি কৰিব পাৰিব।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ফণ্টৰ আকাৰ সলনি কৰক"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্ৰীণ ৰিডাৰ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিঅ\' আৰু স্ক্ৰীণত প্ৰদৰ্শিত পাঠ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"কেপশ্বন"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"অডিঅ’"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ডিছপ্লে’"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"পাঠ আৰু ডিছপ্লে’"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্ৰীনখন গাঢ় কৰক"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীলা-হালধীয়া"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"উজ্জ্বলতা কমাওক"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"আপোনাৰ ফ’নটোৰ ন্যূনতম উজ্জ্বলতাতকৈ স্ক্ৰীনখন গাঢ় কৰি তোলে"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"আপোনাৰ টেবলেটটোৰ ন্যূনতম উজ্জ্বলতাতকৈ স্ক্ৰীনখন গাঢ় কৰি তোলে"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"আপোনাৰ স্ক্ৰীনখন গাঢ় কৰি তোলে যাতে পঢ়িবলৈ আৰু সুবিধাজনক হয়।&lt;br/&gt;&lt;br/&gt; এইটো এই ক্ষেত্ৰসমূহত সহায়ক হ’ব পাৰে: &lt;ol&gt; &lt;li&gt; আপোনাৰ ফ’নটোৰ ডিফ’ল্ট ন্যূনতম উজ্জ্বলতা তথাপি যদি বেছি উজ্জ্বল হয়&lt;/li&gt; &lt;li&gt; আপুনি নিজৰ ফ’নটো কোনো অন্ধকাৰ স্থানত ব্যৱহাৰ কৰি থাকিলে যেনে, ৰাতি অথবা শোৱাৰ আগতে এটা অন্ধকাৰ কোঠাত ব্যৱহাৰ কৰি থাকোঁতে&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ৰিংট\'নসমূহ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"অইন ধ্বনি আৰু কম্পনসমূহ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"জাননী"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"বাৰ্তালাপ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"অলপতে পঠিওৱা হ’ল"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"যোৱা ৭ দিনৰ সকলোখিনি চাওক"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"উচ্চখাপৰ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"সাধাৰণ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"কৰ্মস্থান সম্পৰ্কীয় জাননীসমূহ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"অভিযোজিত জাননীসমূহ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"অভিযোজিত জাননীৰ অগ্ৰাধিকাৰ"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শ্বেড, ষ্টেটাছ বাৰ আৰু লক স্ক্ৰীণত দেখুৱাওক"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"স্থিতি দণ্ডত নীৰৱ জাননীসমূহ লুকুৱাওক"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"অনুজ্জ্বল পোহৰ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"লকস্ক্ৰীনত দেখা পোৱা জাননীসমূহ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"গোপনীয়তা"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্ৰীণ বাদ দিয়ক"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"মুখাৱয়বৰদ্বাৰা আনলক কৰি, পোনপটীয়াকৈ শেহতীয়াকৈ ব্যৱহাৰ কৰা স্ক্ৰীণলৈ যাওক"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্ৰীণ, লকস্ক্ৰীণ, বাদ দিয়ক, প্ৰতিহত কৰক"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"বাৰ্তালাপৰ জাননী"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"সতৰ্কতামূলক জাননী"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"নীৰৱ জাননী"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"এই শ্ৰোতাগৰাকীৰ বাবে ব্ৰিজ নকৰা এপ্‌সমূহ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"আটাইবোৰ এপ্‌ ব্ৰিজ কৰা হৈছে"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d টা এপ্‌ ব্ৰিজ কৰা হোৱা নাই</item>
+      <item quantity="other">%d টা এপ্‌ ব্ৰিজ কৰা হোৱা নাই</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ব্ৰিজ কৰা এপ্‌"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআৰ সহায়ক সেৱা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ইনষ্টল কৰি থোৱা কোনো এপে ভিআৰ সহায়ক সেৱা হিচাপে চলাবলৈ অনুৰোধ কৰা নাই।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR সেৱাক <xliff:g id="SERVICE">%1$s</xliff:g>ত প্ৰৱেশৰ অনুমতি দিয়ে নে?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টা সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"বাহকৰ ডেটা গণনা কাৰ্য ডিভাইচৰ গণনাতকৈ পৃথক হ’ব পাৰে"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"বাহকৰ নেটৱৰ্কসমূহে ব্যৱহাৰ কৰা ডেটা বহিৰ্ভূত কৰে"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"বাহকৰ নেটৱর্কে ব্যৱহাৰ কৰা ডেটা বহিৰ্ভূত কৰে"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> খৰচ কৰা হৈছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা ব্যৱহাৰৰ সকীয়নি ছেট কৰক"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সকিয়নী"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"নেটৱৰ্ক অপাৰেটিং ম\'ডটো সলনি কৰক"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ প্ৰকাৰ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"বাহক"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ছেটিঙৰ সংস্কৰণ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"কল ছেটিং"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"বাহকৰ ভিডিঅ\' কলিং"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ছিষ্টেম বাছনি"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ছিমখন আঁতৰাওক আৰু পুনৰ ভৰাওক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ছিমখন পুনৰ অন কৰিবলৈ চেষ্টা কৰক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটৱৰ্ক সক্ৰিয়কৰণ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"বাহক সলনি কৰা কাৰ্য"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> সক্ৰিয় হৈ আছে"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ছিমৰ ছেটিং আপডে’ট কৰিবলৈ টিপক"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰা হ’ল"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলব্ধ নহয়"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাৱে উপলব্ধ নহয়"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ছিম নাই"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অগ্ৰাধিকাৰ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটৱৰ্কৰ অগ্ৰাধিকাৰ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ৰাজহুৱা নেটৱৰ্কসমূহৰ সৈতে সংযোগ কৰক"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেতাঁৰ, ডেটা, ৱাইফাই, ৱাই-ফাই, ৱাই ফাই, চেলুলাৰ, ম’বাইল, চেল কেৰিয়াৰ, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক চাওক"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"সংযোগ ঠিক কৰক"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক উপলব্ধ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটৱৰ্ক সলনি কৰিবলৈ ইথাৰনেটৰ পৰা সংযোগ বিচ্ছিন্ন কৰক"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"সংযুক্ত হৈ থাকোঁতে নেটৱৰ্ক সলনি কৰিব নোৱাৰি"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"এয়াৰপ্লেন ম’ডত উপলব্ধ নেটৱৰ্ক"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"সংযোজিত হৈ আছে"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফ’ন নম্বৰটো দিয়ক"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফ’ন নম্বৰটো নাই।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gৰ অনুমতি দিয়ক"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index da2488d..7aa845b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ekrandakı mətni kiçildin və ya böyüdün."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kiçildin"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Böyüdün"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Avtodönüşdən istifadə edin"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Üz əsaslı Avtodönüş kiminsə ekrana baxıb-baxmadığını və necə baxdığını bilmək üçün ön kameradan istifadə edir. O, aşağı baxdıqda oxumağa imkan verir və görüntülər heç vaxt saxlanılmır və ya Google\'a göndərilmir.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ətraflı məlumat&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Mətn nümunəsi"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ozlu Heyrətamiz Sehrbaz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Fəsil 11: Məftunedici Zümrüd Şəhəri Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Axtarış"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Avtodönüşlü ekran"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Deaktiv"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktiv"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktiv - Üz əsaslı"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Üz Aşkarlanmasını aktiv edin"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Rənglər"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Təbii"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Artan"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Digər istifadəçilər"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Cihaz yaddaşı"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Daşınan yaddaş ehtiyatı"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> üzrə <xliff:g id="USED">%1$s</xliff:g> istifadə"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> istifadə olunub"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Son vaxtlarda məkana girişi edən tətbiq yoxdur"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Çox batareya istifadəsi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Az batareya istifadəsi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi və Bluetooth skanlaması"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi skan edilir"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi deaktiv olsa belə, tətbiq və xidmətlərin Wi‑Fi şəbəkələrini istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı funksiya və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skan edilir"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth deaktiv olsa belə, tətbiq və xidmətlərə yaxınlıqdakı cihazları istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı funksiya və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş üçün məkan xidmətləri"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Məkan üzrə saat qurşağının aşkarlanması"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Məkan üzrə saat qurşağının aşkarlanması"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Şriftin ölçüsünü dəyişin"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran oxuyucuları"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio və ekran mətni"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrlər"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Mətn və displey"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı qaraldın"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Parlaqlığı Azaldın"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ekranı telefonunuzun minimum parlaqlığından qaranlıq edin"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ekranı planşetinizin minimum parlaqlığından qaranlıq edin"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Rahat oxumaq üçün ekranı qaraldın.&lt;br/&gt;&lt;br/&gt; Bu, aşağıdakı hallarda faydalı ola bilər: &lt;ol&gt; &lt;li&gt; Telefonunuzun defolt minimum parlaqlığı hələ də çox parlaq olduqda&lt;/li&gt; &lt;li&gt; Gecə və ya yatmazdan əvvəl qaranlıq otaqda olmaq kimi qaranlıq yerlərdə telefonunuzu istifadə etdiyiniz zaman&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zəng səsləri"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Digər səs və vibrasiyalar"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirişlər"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Söhbət"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Ən son göndərilənlər"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Son 7 gün ərzində olanların hamısına baxın"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Qabaqcıl ayarlar"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ümumi"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"İş bildirişləri"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptiv bildirişlər"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptiv bildiriş prioriteti"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılan menyu, status paneli &amp; kilid ekranında görünür"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Status panelində səssiz bildirişləri gizlədin"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Parıltı işığı"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kilid ekranında bildirişlər"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Məxfilik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilid ekranını keçin"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Üz ilə kilidi açdıqdan sonra birbaşa əsas səhifə ekranına keçin"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran kilidi, ekrankilidi, keçin, ötürün"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Söhbət bildirişləri"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Xəbərdarlıq bildirişləri"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Səssiz bildirişlər"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Bu dinləyici ilə əlaqələndirilməmiş tətbiqlər"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Bütün tətbiqlər əlaqələndirilib"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d tətbiq əlaqələndirilməyib</item>
+      <item quantity="one">%d tətbiq əlaqələndirilməyib</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Əlaqəli tətbiqlər"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR köməkçi xidmətləri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Heç bir tətbiq VR köməkçi xidmətləri kimi çalışma sorğusu göndərməyib."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xidmətinə <xliff:g id="SERVICE">%1$s</xliff:g> üçün girişə icazə verilsin?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 məhdudiyyət</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data hesablanması cihazınızın hesablamasından fərqli ola bilər"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operator şəbəkələri tərəfindən istifadə edilən data daxil deyil"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Operator şəbəkələri tərəfindən istifadə edilən data daxil deyil"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Data xəbərdarlığı ayarlayın"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data xəbərdarlığı"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Şəbəkə əməliyyat rejimini dəyişin"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tərcih edilmiş şəbəkə növü"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ayarlar versiyası"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Zəng edilir"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video zəngi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistem seçin"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-i çıxarıb yenidən taxın. Problem həll olmasa, cihazı yenidən başladın."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-i yenidən aktiv etməyə çalışın. Problem həll olmasa, cihazı yenidən başladın."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Şəbəkənin aktiv edilməsi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator dəyişdirilir"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivdir"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını yeniləmək üçün toxunun"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçdiniz"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"əlçatmazdır"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Müvəqqəti olaraq əlçatan deyil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM yoxdur"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tərcihlər"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Şəbəkə tərcihləri"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"İctimai şəbəkələrə qoşulun"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"şəbəkə bağlantısı, internet, simsiz, data, wifi, wi-fi, wi fi, mobil şəbəkə, mobil, mobil operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Təyyarə rejimi şəbəkələrinə baxın"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Bağlantını düzəldin"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Təyyarə rejimi şəbəkələri əlçatandır"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Şəbəkələri dəyişmək üçün etherneti ayırın"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Qoşulduqdan sonra şəbəkələri dəyişmək olmur"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Təyyatə rejimi şəbəkələri"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Qoşulub"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon nömrəsini daxil edin"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon nömrəsi yoxdur."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G şəbəkəsinə icazə verin"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 7532143..206fa4a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Omogućava da tekst na ekranu bude manji ili veći."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Umanji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Uvećaj"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Koristite automatsko rotiranje"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatsko rotiranje na osnovu lica koristi prednju kameru da bi utvrdilo da li i kako neko gleda u ekran. To omogućava čitanje dok ležite, a slike se nikad ne čuvaju niti šalju Google-u.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Primer teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Poglavlje 11: Čudesni Smaragdni grad Oza"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraga"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatsko rotiranje ekrana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na osnovu lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogući prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačane"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ostali korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Memorija uređaja"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosna memorija"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Koristi se <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"od ukupno <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije nedavno pristupila lokaciji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Velika potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mala potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi i Bluetooth skeniraju"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dozvolite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skeniranje"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Možete da prilagodite ovaj uređaj prema potrebama. Te funkcije pristupačnosti možete kasnije da promenite u Podešavanjima."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titl"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjuje ekran"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjite osvetljenost"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Zatamnite ekran više od minimalne osvetljenosti telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Zatamnite ekran više od minimalne osvetljenosti tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Zatamnite ekran da bi vam čitanje bilo prijatnije.&lt;br/&gt;&lt;br/&gt; To može da vam bude korisno: &lt;ol&gt; &lt;li&gt; kada je podrazumevana minimalna osvetljenost telefona i dalje jaka&lt;/li&gt; &lt;li&gt; kada koristite telefon u mraku, na primer, noću ili u tamno sobi pre odlaska na spavanje&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obaveštenja"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzacija"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslato"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve iz poslednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Napredna"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opšte"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Poslovna obaveštenja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obaveštenja"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritet prilagodljivog obaveštenja"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na kliznom panelu, statusnoj traci i zaključanom ekranu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij nečujna obaveštenja na statusnoj traci"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Uključi treperenje lampice"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obaveštenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključan ekran"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Posle otključavanja licem idi direktno na poslednji ekran"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključani ekran, preskočiti, zaobići"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Obaveštenja za konverzaciju"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučna obaveštenja"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Nečujna obaveštenja"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacije koje nisu premošćene za ovog slušaoca"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Sve aplikacije su premošćene"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d aplikacija nije premošćena</item>
+      <item quantity="few">%d aplikacije nisu premošćene</item>
+      <item quantity="other">%d aplikacija nije premošćeno</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Premošćene apl."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za virtuelnu realnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zahtevala da se pokrene kao usluga pomagača za virtuelnu realnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li da dozvolite pristup usluzi virtuelne realnosti za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnih operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne obuhvata podatke koje koriste mreže mobilnih operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Podesi upozorenje o podacima"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje za potrošnju podataka"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promena režima rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Željeni tip mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilni operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija podešavanja"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Video pozivanje preko operatera"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Izbor sistema"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Uklonite SIM karticu, pa je stavite ponovo. Ako se problem i dalje javlja, restartujte uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probajte ponovo da uključite SIM karticu. Ako se problem i dalje javlja, restartujte uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Prelazak na drugog mobilnog operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Mobilni operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali podešavanja SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prešli ste na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno je nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Podešavanja"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Podešavanja mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se sa javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilni telefon, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže za režim rada u avionu"</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Reši problem sa povezivanjem"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za režim rada u avionu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste promenili mrežu, prekinite eternet vezu"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete da promenite mrežu dok ste povezani"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u režimu rada u avionu"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nije naveden broj telefona."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Potvrdi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dozvolite 2G"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1b660a4..0ff9659 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Павелічэнне або памяншэнне тэксту на экране."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Паменшыць"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Павялічыць"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Выкарыстоўваць аўтапаварот"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Калі карыстальнік глядзіць на экран, функцыя аўтапавароту з улікам паставы галавы вызначае праз пярэднюю камеру становішча яго галавы. Дзякуючы гэтай функцыі можна чытаць лежачы. Відарысы не захоўваюцца і не адпраўляюцца ў Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Даведацца больш&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Прыклад тэксту"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чараўнік краіны Оз"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Раздзел 11. Цудоўны Смарагдавы Горад у краіне Оз"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пошук"</string>
     <string name="display_settings" msgid="7197750639709493852">"Дысплэй"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Аўтаматычны паварот экрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Выключана"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Уключана"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Укл. – З улікам паставы галавы"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Уключыць выяўленне твару"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Колеры"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральныя"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яркія"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Iншыя карыстальнікi"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Сховішча на прыладзе"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Партатыўнае сховішча"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Выкарыстана <xliff:g id="USED">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Усяго <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"У апошні час ніводная праграма не атрымлівала доступу да звестак пра месцазнаходжанне"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Выс. узровень выкарыст. акум."</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Нізкі ўзровень выкарыст. акум."</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Праверка Wi‑Fi і Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Пошук сетак Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дазвольце праграмам і сэрвісам шукаць сеткі Wi‑Fi, нават калі Wi‑Fi не падключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканіраванне Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дазвольце праграмам і сэрвісам шукаць прылады паблізу, нават калі Bluetooth выключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Службы геалакацыі для працы"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Вызначэнне часавага пояса месцазнаходжання"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Вызначэнне часавага пояса месцазнаходжання"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Змяніць памер шрыфту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Праграмы чытання з экрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аўдыя і тэкст на экране"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Субцітры"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аўдыя"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Дысплэй"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Тэкст і дысплэй"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Зацямніць экран"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сіні і жоўты"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Паменшыць яркасць"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Зрабіць экран тэлефона цямнейшым, чым пры мінімальным узроўні яркасці"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Зрабіць экран планшэта цямнейшым, чым пры мінімальным узроўні яркасці"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Зацямніце экран, каб было зручней чытаць.&lt;br/&gt;&lt;br/&gt; Гэта можа быць карысным у наступных выпадках: &lt;ol&gt; &lt;li&gt; узровень стандартнай мінімальнай яркасці на вашым тэлефоне даволі высокі;&lt;/li&gt; &lt;li&gt; вы выкарыстоўваеце тэлефон ва ўмовах цемнаты, напрыклад ноччу ці ў цёмным памяшканні перад адыходам да сну.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рынгтоны"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Іншыя гукі і вібрацыя"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Апавяшчэнні"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Размова"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Нядаўна адпраўленыя"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Прагледзець усё за апошнія 7 дзён"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Пашыраныя налады"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Агульныя налады"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Апавяшчэнні працоўнага профілю"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптыўныя апавяшчэнні"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Прыярытэт адаптыўных апавяшчэнняў"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Паказваць на апушчанай шторцы, панэлі стану і на экране блакіроўкі"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Хаваць апавяшчэнні без гуку на панэлі стану"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Мігценне святла"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Апавяшчэнні экрана блакіроўкі"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Прыватнасць"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прапускаць экран блакіроўкі"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Пасля распазнавання твару вяртацца на папярэдні экран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Экран блакіроўкі, экран блакіроўкі, прапусціць, абысці"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Апавяшчэнні пра паведамленні"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Апавяшчэнні з абвесткамі"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Апавяшчэнні без гуку"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Праграмы, не падключаныя да сеткавага моста з гэтым сродкам праслухоўвання"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Усе праграмы падключаны"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">Да сеткавага моста не падключана %d праграма</item>
+      <item quantity="few">Да сеткавага моста не падключаны %d праграмы</item>
+      <item quantity="many">Да сеткавага моста не падключаны %d праграм</item>
+      <item quantity="other">Да сеткавага моста не падключаны %d праграмы</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Падключаныя праграмы"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Дапаможныя VR-сэрвісы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Усталяваныя праграмы не запытвалі выканання ў якасці службы-памочніка віртуальнай рэальнасці (VR)."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> абмежавання</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Улік даных аператара можа адрознівацца ад уліку прылады"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Выключае трафік пра сеткі, якія належаць аператарам"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Выключае трафік праз сеткі, якія належаць аператарам"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Укл. папярэджанне пра трафік"</string>
     <string name="data_warning" msgid="2925054658166062884">"Папярэджанне пра трафік"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Змяніць рэжым работы сеткі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Прыярытэтны тып сеткі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Аператар"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версія налад"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Выклік"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Відэавыклікі праз аператара"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Выбар сістэмы"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Выдаліце SIM-карту і ўстаўце яе зноў. Калі праблема застанецца, перазапусціце прыладу."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Паспрабуйце зноў уключыць SIM-карту. Калі праблема застанецца, перазапусціце прыладу."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Актывацыя сеткі"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Пераключаецца аператар"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сетка \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" актыўная"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Націсніце, каб абнавіць налады SIM-карты"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Пераключана на сетку \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недаступны"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Часова недаступны"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM-карты"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметры"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Параметры сеткі"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Падключацца да агульнадаступных сетак"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"падключэнне да сеткі, інтэрнэт, бесправадны, даныя, wifi, wi-fi, wi fi, сотавая сетка, мабільны, аператар сотавай сувязі, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Праглядзець сеткі рэжыма палёту"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Выправіць праблему з падключэннем"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сеткі даступныя ў рэжыме палёту"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Каб падключыцца да сетак, выключыце Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Пакуль падключана праз Ethernet, нельга пераключыць сетку"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сеткі ў рэжыме палёту"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Падключана"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Увядзіце нумар тэлефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Нумар тэлефона адсутнічае."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дазволіць 2G"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0e0ab78..19dd1a4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Други потребители"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Хранилище на устройството"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Преносимо хранилище"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Използвали сте <xliff:g id="USED">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Използвано от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Наскоро приложенията не са осъществявали достъп до местоположението"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Висок разход на батерията"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Нисък разход на батерията"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Сканиране за Wi‑Fi и Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Сканиране за Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Разрешете на приложенията и услугите да сканират за Wi‑Fi мрежи по всяко време дори когато функцията за Wi‑Fi e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканиране за устройства с Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги за местоположение за служебни цели"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Установяване на часовата зона чрез местоположението"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Установяване на часовата зона чрез местоположение"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Можете да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Промяна на размера на шрифта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Екранни четци"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и екранен текст"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Надписи"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и показване"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затъмняване на екрана"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синьо-жълто"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Намаляване на яркостта"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Направете екрана по-тъмен, отколкото с настройката за минимална яркост на телефона ви"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Направете екрана по-тъмен, отколкото с настройката за минимална яркост на таблета ви"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затъмнете екрана си така, че да ви е по-удобно да четете.&lt;br/&gt;&lt;br/&gt; Това може да бъде полезно, когато: &lt;ol&gt; &lt;li&gt; екранът е твърде светъл при стандартната настройка за минимална яркост на телефона ви;&lt;/li&gt; &lt;li&gt; използвате телефона си на тъмно, като например през нощта или в тъмна стая преди лягане.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звуци и вибриране"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Известия"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговор"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Наскоро изпратили известия"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Преглед на всички от последните 7 дни"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Разширени"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Общи"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Служебни известия"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивни известия"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет на адаптивните известия"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показване в падащия панел, в лентата на състоянието и на заключения екран"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Скриване на беззвучните известия в лентата на състоянието"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Премигваща светлина"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Известия на заключения екран"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Поверителност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускане на заключения екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"След отключване с лице отваряне на последния използван екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"заключен екран, пропускане, заобикаляне"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Известия за разговори"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Известия за сигнализиране"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучни известия"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Приложения, които не са в мостов режим за този приемател"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Всички приложения са в мостов режим"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d приложения не са в мостов режим</item>
+      <item quantity="one">%d приложение не е в мостов режим</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Приложения в мостов режим"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Помощни услуги за VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Никое инсталирано приложение не е заявило да се изпълнява като помощна услуга за VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Искате ли <xliff:g id="SERVICE">%1$s</xliff:g> да има достъп като услуга за VR?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 ограничение</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Отчетените от оператора данни може да се различават от показаните на устройството"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Изключва данните, които се използват от мрежите на операторите"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Изключва данните, които се използват от мрежите на операторите"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Задаване на предупр. за данните"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение за данните"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Промяна на операционния режим на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Предпочитан тип мрежа"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версия на настройките"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Обаждания"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеообаждания от оператора"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избор на система"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Премахнете SIM картата и я поставете отново. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Включете отново SIM картата. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активиране на мрежа"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Превключване на оператора"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Услугата <xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Докоснете, за да актуализирате настройките за SIM картата"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Превключихте към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"не е налице"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно не е налице"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM карта"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Предпочитания"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Предпочитания за мрежата"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Свързване с обществени мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"връзка с мрежата, интернет, безжична мрежа, данни, Wi-Fi, мобилни данни, мобилна мрежа, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Преглед на мрежите за самолетен режим"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Отстраняване на проблеми с връзката"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Мрежите за самолетен режим са налице"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За да превключите мрежите, прекъснете връзката с Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се превключи към друга мрежа, докато сте свързани"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за самолетен режим"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Свързано"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Въведете телефонен номер"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Липсва телефонен номер."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Разрешаване на 2G"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 360737b..2783af8 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"স্ক্রিনের টেক্সট ছোট বা বড় করুন।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"আরো ছোট করুন"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"আরো বড় করুন"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"অটো-রোটেট ব্যবহার করুন"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"কোনও ব্যক্তি যদি স্ক্রিনের দিকে তাকান তবে কীভাবে তাকিয়েছেন তা দেখতে মুখের হিসেবে অটো রোটেট ফ্রন্ট ক্যামেরা ব্যবহার করে। এই সুবিধার সাহায্যে শুয়ে পড়তে পারা যায় এবং ছবি কখনই Google-এ স্টোরেজ করা বা পাঠানো হয় না।&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;আরও জানুন&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"স্যাম্পেল টেক্সট"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"দ্যা ওয়ান্ডারফুল উইজার্ড অফ অজ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"অধ্যায় ১১: দ্যা ওয়ান্ডারফুল এমারল্ড সিটি অফ ওজ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"সার্চ"</string>
     <string name="display_settings" msgid="7197750639709493852">"ডিসপ্লে"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"অটো-রোটেট স্ক্রিন"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"বন্ধ আছে"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"চালু আছে"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"চালু আছে - মুখের হিসেবে"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ফেস ডিটেকশন চালু করুন"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"রঙ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"স্বাভাবিক"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"বুস্ট করা"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"অন্য ব্যবহারকারীরা"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইসের স্টোরেজ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"পোর্টেবল স্টোরেজ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"সম্প্রতি কোনও অ্যাপ লোকেশন অ্যাক্সেস করেনি"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"উচ্চ ব্যাটারির ব্যবহার"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"কম ব্যাটারির ব্যবহার"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ওয়াই-ফাই এবং ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ওয়াই-ফাই স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় ওয়াই-ফাই নেটওয়ার্ক স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কাজের জন্য অবস্থান ভিত্তিক পরিষেবা"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"আপনি এই ডিভাইসটি নিজের পছন্দমত সেট করতে পারেন৷ এই অ্যাক্সেসিবিলিটি বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"হরফের মাপ পরিবর্তন করুন"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্রিন রিডার"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ক্যাপশন"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"অডিও"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ডিসপ্লে"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"টেক্সট এবং ডিসপ্লে"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্রিনের উজ্জ্বলতা কমান"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীল-হলুদ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"উজ্জ্বলতা কমান"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"স্ক্রিনের উজ্জ্বলতা আপনার ফোনের নূন্যতম উজ্জ্বলতার চেয়েও কম করুন"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"স্ক্রিনের উজ্জ্বলতা আপনার ট্যাবলেটের নূন্যতম উজ্জ্বলতার চেয়েও কম করুন"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"স্ক্রিনের উজ্জ্বলতা কমিয়ে গাঢ় করুন যাতে সহজেই পড়া যায়।&lt;br/&gt;&lt;br/&gt; এটি নিচের কাজগুলি করার সময় সহায়ক হতে পারে যখন: &lt;ol&gt; &lt;li&gt; আপনার ফোনের ডিফল্ট নূন্যতম উজ্জলতাও প্রয়োজনের চেয়ে বেশি&lt;/li&gt; &lt;li&gt; আপনি অন্ধকারে ফোন ব্যবহার করছেন যেমন, রাতে বা ঘুমানোর আগে অন্ধকার ঘরে&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"রিংটোনগুলি"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"অন্যান্য সাউন্ড এবং ভাইব্রেশন"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"বিজ্ঞপ্তি"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"কথোপকথন"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"সম্প্রতি পাঠানো হয়েছে"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"গত ৭ দিন থেকে সব দেখুন"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"উন্নত"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"সাধারণ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"অ্যাডাপটিভ বিজ্ঞপ্তি"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"অ্যাডাপটিভ বিজ্ঞপ্তির অগ্রাধিকার"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শেড, স্ট্যাটাস বার ও লক স্ক্রিনে দেখানো হয়"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"স্ট্যাটাস বারে সাইলেন্ট বিজ্ঞপ্তি লুকান"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"মিটমিট করা আলো"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"লক স্ক্রিনে বিজ্ঞপ্তি"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"গোপনীয়তা"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্রিন এড়িয়ে যাওয়া"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"মুখের সাহায্যে আনলক করে সরাসরি শেষবার ব্যবহৃত স্ক্রিনে যান"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্রিন, লকস্ক্রিন, স্কিপ, বাইপাস"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"কথোপকথনের বিজ্ঞপ্তি"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"সতর্কতামূলক বিজ্ঞপ্তি"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"নিঃশব্দ বিজ্ঞপ্তি"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"এই শ্রোতার জন্য যেসব অ্যাপ ব্রিজ করা হয়নি"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"সবকটি অ্যাপ ব্রিজ করা হয়েছে"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%dটি অ্যাপ ব্রিজ করা হয়নি</item>
+      <item quantity="other">%dটি অ্যাপ ব্রিজ করা হয়নি</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ব্রিজ করা অ্যাপ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআর(VR) সহায়তাকারী পরিষেবা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"vr সহায়তাকারী পরিষেবা হিসেবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য (ভিআর)VR পরিষেবার অ্যাক্সেসের অনুমতি দেবেন?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টি সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"পরিষেবা প্রদানকারী ডেটার হিসাব, ডিভাইসের হিসাব থেকে ভিন্ন হতে পারে"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"পরিষেবা প্রদানকারী নেটওয়ার্ক যে ডেটা ব্যবহার করে তা অন্তর্ভুক্ত নয়"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"পরিষেবা প্রদানকারী নেটওয়ার্কের ব্যবহৃত ডেটা বাদ দিয়ে"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা সতর্কতা সেট করুন"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সতর্কতা"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"নেটওয়ার্ক অপারেটিং মোড পরিবর্তন করুন"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"পছন্দের নেটওয়ার্ক"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"পরিষেবা প্রদানকারী"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"সেটিংস ভার্সন"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"কল করা হচ্ছে"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"পরিষেবা প্রদানকারীর ভিডিও কলিং"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"সিস্টেমের বেছে নেওয়া"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"সিম কার্ডটি বের করে আবার ইনসার্ট করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"সিমটি আবার চালু করার চেষ্টা করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটওয়ার্ক চালু করা"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"পরিষেবা প্রদানকারী পাল্টানো হচ্ছে"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> চালু আছে"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"সিম সেটিংস আপডেট করতে ট্যাপ করুন"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> নেটওয়ার্ক ব্যবহার করা শুরু করেছেন"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলভ্য নেই"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাবে উপলভ্য নেই"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"কোনও সিম নেই"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অভিরুচি"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটওয়ার্ক সংক্রান্ত পছন্দ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"সর্বজনীন নেটওয়ার্কে কানেক্ট করুন"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই, ওয়াই-ফাই, ওয়াই-ফাই, মোবাইল ডেটা, মোবাইল, মোবাইল পরিষেবা প্রদানকারী, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"বিমান মোড নেটওয়ার্ক দেখুন"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"কানেক্টিভিটি সংক্রান্ত সমস্যার সমাধান"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"বিমান মোডে উপলভ্য নেটওয়ার্ক"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটওয়ার্ক বদলাতে ইথারনেট ডিসকানেক্ট করুন"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"কানেক্ট থাকার সময় অন্য নেটওয়ার্কে পরিবর্তন করা যাবে না"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"বিমান মোড নেটওয়ার্ক"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"কানেক্ট করা আছে"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফোন নম্বর লিখুন"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফোন নম্বর নেই।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ব্যবহারের অনুমতি দিন"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a94e82b..a2a8dda 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Smanjite ili povećajte tekst na ekranu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Napravi manji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Napravi veći"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Koristite automatsko rotiranje"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatsko rotiranje na osnovu lica koristi prednju kameru da vidi gleda li neko u ekran i na koji način. Omogućava čitanje u ležećem položaju, a slike se nikada ne pohranjuju niti šalju Googleu.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Uzorak teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Poglavlje 11: Smaragdni grad Oz"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraži"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatsko rotiranje ekrana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na osnovu lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogućite prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačane"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Uređaj za memoriju"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosiva memorija"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> se koristi od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Se koristi od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije nedavno pristupila lokaciji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niska potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skeniranje WiFi-ja i Bluetootha"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skeniranje WiFi-ja"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dozvolite aplikacijama i uslugama da skeniraju WiFi mreže u svakom trenutku, čak i kada je WiFi mreža isključena. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skeniranje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da skeniraju uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone pomoću lokacije"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone pomoću lokacije"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ovaj uređaj možete prilagoditi svojim potrebama. Funkcije pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promijenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titlovi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjivanje ekrana"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjenje osvjetljenja"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Potamnite ekran više od minimalne osvijetljenosti telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Potamnite ekran više od minimalne osvijetljenosti tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Potamnite ekran da vam čitanje bude ugodnije.&lt;br/&gt;&lt;br/&gt; To može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost telefona i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite telefon u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ostali zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obavještenja"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Razgovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve tokom posljednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Napredno"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opće"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obavještenja za posao"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obavještenja"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljivi prioritet obavještenja"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na padajućoj traci, statusnoj traci i zaključanom ekranu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij nečujna obavještenja na statusnoj traci"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepćuće svjetlo"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obavještenja na zaklj. ekranu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključani ekran"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nakon otključavanja licem idi na posljednji korišteni ekran"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključaj ekran, zaljučavanje ekrana, preskoči, zaobilaženje"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Obavještenja o razgovorima"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučna obavještenja"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Nečujna obavještenja"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacije koje nisu premoštene za ovog slušaoca"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Sve aplikacije su premoštene"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d aplikacija nije premoštena</item>
+      <item quantity="few">%d aplikacije nisu premoštene</item>
+      <item quantity="other">%d aplikacija nije premošteno</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Premoštene aplikacije"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao usluga pomagača za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li dozvoliti pristup VR-a za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnog operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne obuhvata podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Iskorišteno je <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozor. o prij. podat."</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o prijenosu podataka"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferirana vrsta mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija postavki"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operater video pozivanja"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Odabir sistema"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM karticu i ponovo je umetnite. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktiviranje mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Promjena operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da ažurirate postavke SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prebacili ste se na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Trenutno nije dostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM-a"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežični, podaci, wifi, wi-fi, wi fi, celularni, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže načina rada u avionu"</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Popravi povezivost"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u avionu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da promijenite mrežu, isključite ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nije moguće promijeniti mreže kada ste povezani"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže za način rada u avionu"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Broj telefona nedostaje."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Uredu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dozvoli 2G"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dc3b37c..9bbe4f1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Amplia o redueix la mida del text de la pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Redueix"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Amplia"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gira automàticament"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"La funció Gira automàticament basada en cares utilitza la càmera frontal per veure si algú mira la pantalla i com ho fa. Així podràs llegir mentre estàs estirat. Les imatges mai s\'emmagatzemen ni envien a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Més informació&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Text de mostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El meravellós mag d\'Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítol 11: La meravellosa Ciutat Maragda d\'Oz"</string>
@@ -440,7 +438,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Aixeca el dit i toca de nou"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continua aixecant el dit per afegir les diferents parts de l\'empremta digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empremta digital afegida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"S\'ha afegit l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Quan vegis aquesta icona, fes servir l\'empremta digital per identificar-te o aprovar compres."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Fes-ho més tard"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Sortir de la configuració de l\'empremta?"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Cerca"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Gira pantalla automàticament"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivat"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activat"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activat: basat en cares"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activa la detecció facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colors"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Millorat"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Altres usuaris"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Emmagatzematge del dispositiu"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Emmagatzematge portàtil"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilitzats de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En ús de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Cap aplicació no ha accedit recentment a la teva ubicació"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Consum de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Poc consum de bateria"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Cerca de Wi‑Fi i Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Cerca de xarxes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permet que les aplicacions i els serveis cerquin xarxes Wi-Fi en qualsevol moment, fins i tot quan la Wi-Fi estigui desactivada. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Cerca de dispositius Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permet que les aplicacions i els serveis cerquin dispositius propers en qualsevol moment, fins i tot quan el Bluetooth estigui desactivat. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serveis d\'ubicació per a la feina"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecció de la zona horària de la ubicació"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecció de la zona horària de la ubicació"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Canvia la mida de la lletra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectors de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Àudio i text en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítols"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Àudio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text i pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Enfosqueix la pantalla"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermell-verd"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermell-verd"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-groc"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducció de la brillantor"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Enfosqueix la pantalla per sota de la brillantor mínima del telèfon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Enfosqueix la pantalla per sota de la brillantor mínima de la tauleta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Enfosqueix la pantalla per llegir més còmodament.&lt;br/&gt;&lt;br/&gt; Això pot ser útil quan: &lt;ol&gt; &lt;li&gt; La brillantor mínima predeterminada del telèfon encara és massa clara.&lt;/li&gt; &lt;li&gt; Utilitzes el telèfon en situacions de poca llum, com ara a la nit o en una habitació fosca abans d\'anar a dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificacions"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviades fa poc"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra-les totes des de fa 7 dies"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Configuració avançada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificacions de la feina"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificacions adaptatives"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritat de notificacions adaptativa"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Es mostra a l\'àrea desplegable, la barra d\'estat i la pantalla de bloqueig"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Amaga les notificacions silencioses a la barra d\'estat"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Llum intermitent"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificacions a la pantalla de bloqueig"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privadesa"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omet la pantalla de bloqueig"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Després del desbloqueig facial, ves a l\'última pantalla utilitzada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantalla de bloqueig, bloqueig, ometre, saltar"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificacions de conversa"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificacions d\'alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificacions silenciades"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplicacions que no estan vinculades a aquest oient"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Totes les aplicacions estan vinculades"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplicacions no estan vinculades</item>
+      <item quantity="one">%d aplicació no està vinculada</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplicacions vinculades"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serveis d\'ajuda per a RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Cap aplicació instal·lada no ha sol·licitat que s\'executi com un servei d\'ajuda per a RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vols permetre que <xliff:g id="SERVICE">%1$s</xliff:g> accedeixi al servei RV?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 restricció</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No inclou les dades que s\'utilitzen en xarxes d\'operadors"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"No inclou les dades que utilitzen les xarxes d\'operadors"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dades utilitzades: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Defineix advertiment de dades"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertiment de dades"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Canvia el mode de funcionament de la xarxa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipus de xarxa preferent"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador de telefonia mòbil"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versió de la configuració"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Trucades"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videotrucades amb l\'operador de telefonia mòbil"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selecció del sistema"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Treu la SIM i torna-la a inserir. Si el problema continua, reinicia el dispositiu."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prova de tornar a activar la SIM. Si el problema continua, reinicia el dispositiu."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activació de la xarxa"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Canvi d\'operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> està actiu"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca per actualitzar la configuració de la targeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"S\'ha canviat a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalment"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hi ha cap SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferències"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferències de xarxa"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connecta\'t a xarxes públiques"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexió a la xarxa, internet, sense fil, dades, wifi, wi‑fi, wi fi, mòbils, mòbil, operador de telefonia mòbil, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Mostra les xarxes del mode d\'avió"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corregeix la connectivitat"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hi ha xarxes en mode d\'avió disponibles"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per canviar de xarxa, desconnecta la connexió Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No es pot canviar de xarxa quan el dispositiu està connectat"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Xarxes en mode d\'avió"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connectat"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introdueix un número de telèfon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de telèfon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"D\'acord"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permet 2G"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3335457..3c981fa 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Umožňuje zvětšit nebo zmenšit text na obrazovce."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Zmenšit"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zvětšit"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Používání automatického otáčení"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatické otáčení podle obličeje pomocí přední kamery sleduje, zda a jak se někdo dívá na obrazovku. Umožňuje tak čtení vleže. Snímky nejsou ukládány ani odesílány do Googlu.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Další informace&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukázkový text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čaroděj ze země Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapitola 11: Smaragdové město v zemi Oz"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Vyhledávání"</string>
     <string name="display_settings" msgid="7197750639709493852">"Displej"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatické otočení obrazovky"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Vyp"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Zap"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Zap – podle obličeje"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivování rozpoznání obličeje"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barvy"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Přirozené"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Zesílené"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Další uživatelé"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Úložiště zařízení"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Přenosné úložiště"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Použito <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Použito z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Polohu v poslední době nepoužily žádné aplikace"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Vysoké využívání baterie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nízké využívání baterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Vyhledávání sítí Wi-Fi a Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Vyhledávání Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Povolit aplikacím a službám vyhledávat sítě Wi‑Fi, i když je připojení k sítím Wi‑Fi vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhledávání Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povolit aplikacím a službám vyhledávat zařízení v okolí kdykoliv, i když je rozhraní Bluetooth vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určování polohy pro práci"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zjišťování časového pásma"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zjišťování časového pásma"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Změňte velikost písma"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čtečky obrazovky"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovce"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titulky"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazení"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text a zobrazení"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ztmavit obrazovku"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žlutá"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Snížit jas"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ztmavit obrazovku více, než je minimální nastavení jasu na telefonu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ztmavit obrazovku více, než je minimální nastavení jasu na tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ztmavte si obrazovku, aby se vám lépe četla.&lt;br/&gt;&lt;br/&gt; Může to být užitečné v těchto případech: &lt;ol&gt; &lt;li&gt; Minimální nastavení jasu na telefonu je stále příliš vysoké.&lt;/li&gt; &lt;li&gt; Používáte telefon v tmavém prostředí, například v noci nebo v tmavém pokoji před spaním.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Vyzvánění"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Další zvuky a vibrace"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Oznámení"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzace"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedávno odeslané"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobrazit vše za posledních 7 dní"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Rozšířená nastavení"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Obecné"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pracovní oznámení"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptivní oznámení"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptivní priorita oznámení"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazí se na vysouvacím panelu, stavovém řádku a obrazovce uzamčení"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skrýt tichá oznámení na stavovém řádku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikání kontrolky"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Oznámení na obrazovce uzamčení"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Soukromí"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Přeskočit obrazovku uzamčení"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odemknutí obličejem přejít přímo na poslední obrazovku"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Obrazovka uzamčení, přeskočení, obejití"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Oznámení o konverzacích"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Oznámení s upozorněním"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Tichá oznámení"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikace, které nejsou přemostěny s tímto posluchačem"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Všechny aplikace jsou přemostěny"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="few">%d aplikace nejsou přemostěny</item>
+      <item quantity="many">%d aplikace není přemostěno</item>
+      <item quantity="other">%d aplikací není přemostěno</item>
+      <item quantity="one">%d aplikace není přemostěna</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Přemostěné aplikace"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žádné nainstalované aplikace nepožádaly o spuštění jako pomocná služba VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Povolit přístup k VR službě pro <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="one">1 omezení</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operátor může data počítat jinak než zařízení"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vyloučí data využitá sítěmi operátora"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vyloučí data využitá sítěmi operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Využito <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavit upozornění na data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozornění na data"</string>
@@ -4559,9 +4571,9 @@
     <string name="notification_log_details_importance" msgid="8516198274667183446">"důležitost"</string>
     <string name="notification_log_details_explanation" msgid="6966274549873070059">"vysvětlení"</string>
     <string name="notification_log_details_badge" msgid="648647240928645446">"může zobrazovat odznak"</string>
-    <string name="notification_log_details_content_intent" msgid="2768423554375629089">"objekt Intent"</string>
-    <string name="notification_log_details_delete_intent" msgid="8296434571041573503">"smazání objektu Intent"</string>
-    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"objekt Intent pro celou obrazovku"</string>
+    <string name="notification_log_details_content_intent" msgid="2768423554375629089">"intent"</string>
+    <string name="notification_log_details_delete_intent" msgid="8296434571041573503">"smazání intentu"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"intent pro celou obrazovku"</string>
     <string name="notification_log_details_actions" msgid="2269605330470905236">"akce"</string>
     <string name="notification_log_details_title" msgid="8365761340979164197">"nadpis"</string>
     <string name="notification_log_details_remoteinput" msgid="264204203044885921">"vzdálené vstupy"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Změnit provozní režim sítě"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferovaný typ sítě"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operátor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verze nastavení"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Volání"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videohovory přes operátora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Výběr systému"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyjměte SIM kartu a znovu ji vložte. Pokud problém přetrvává, restartujte zařízení."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zkuste SIM kartu znovu zapnout. Pokud problém přetrvává, restartujte zařízení."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivace sítě"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Přepnutí operátora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Číslo <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivní"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavení SIM karty"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Přepnuto na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"není k dispozici"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasně nedostupné"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žádná SIM karta"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Předvolby"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Možnosti sítě"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Připojovat k veřejným sítím"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"připojení k síti, internet, bezdrátové, data, wifi, wi-fi, wi fi, mobilní síť, mobilní operátor, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobrazit sítě v režimu Letadlo"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Opravit připojení"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sítě dostupné v režimu Letadlo"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pokud chcete přepnout sítě, odpojte ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Při připojení nelze změnit síť"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sítě v režimu Letadlo"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Připojeno"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadejte telefonní číslo"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chybí telefonní číslo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Povolit 2G"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 01c026e..b951030 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gør teksten på skærmen mindre eller større."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Formindsk"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Forstør"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Brug automatisk rotation"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatisk ansigtsbaseret rotation bruger kameraet på forsiden til at se, om nogen kigger på skærmen, og hvordan vedkommende kigger. Funktionen gør det nemmere at læse, mens man ligger ned. Billeder brugt til funktionen gemmes ikke, og de sendes ikke til Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Få flere oplysninger&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Eksempeltekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Den vidunderlige troldmand fra Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapitel 11: Den vidunderlige smaragdby i Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Søg"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skærm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Roter skærm automatisk"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Fra"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Til"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Til – ansigtsbaseret"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivér ansigtsgenkendelse"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farver"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlig"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Forstærket"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andre brugere"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagerplads på enheden"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Ekstern lagerplads"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Der er anvendt <xliff:g id="USED">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apps har haft adgang til placeringen for nylig"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lavt batteriforbrug"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi- og Bluetooth-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Tillad, at apps og tjenester altid kan søge efter Wi-Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Placeringstjenester til arbejdet"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Registrering af tidszone ved hjælp af placering"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Registrering af tidszone ved hjælp af placering"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Skift skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skærmlæsere"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skærmen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Undertekster"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Lyd"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Visning"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst og visning"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gør skærmen mørkere"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grøn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grøn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducer lysstyrken"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gør skærmen mørkere end den laveste indstilling for lysstyrke på din telefon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gør skærmen mørkere end den laveste indstilling for lysstyrke på din tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gør din skærm mørkere, så du får en mere behagelig læseoplevelse.&lt;br/&gt;&lt;br/&gt; Dette kan være nyttigt, når: &lt;ol&gt; &lt;li&gt; Der er skruet helt ned for lysstyrken på din telefon, men det stadig ikke er mørkt nok&lt;/li&gt; &lt;li&gt; Du bruger din telefon i mørke omgivelser, f.eks. om aftenen eller i et mørkt rum før sengetid&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringetoner"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andre lyde og vibrationer"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifikationer"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtale"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Sendt for nylig"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Se alle fra de seneste syv dage"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanceret"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generelt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Arbejdsunderretninger"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Automatiske notifikationer"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Automatisk prioritetsniveau for notifikationer"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vises i panelet, der trækkes ned, på statusbjælken og på låseskærmen."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skjul lydløse notifikationer på statusbjælken"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifikationer på låseskærm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatliv"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Spring låseskærmen over"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gå til den seneste skærm efter oplåsning med ansigtslås"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskærm, lås skærm, spring over, tilsidesæt"</string>
@@ -3657,7 +3667,7 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifikationer om ugen</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldrig"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Adgang til notifikationer"</string>
+    <string name="manage_notification_access_title" msgid="4714320299084782521">"Notifikationsadgang"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Adgangen til notifikationer fra arbejdsprofilen er blokeret"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps kan ikke læse notifikationer"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalenotifikationer"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notifikationer med vibration eller lyd"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Lydløse notifikationer"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps, som ikke har broforbindelse til denne lytter"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alle apps har broforbindelse"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d app mangler broforbindelse</item>
+      <item quantity="other">%d apps mangler broforbindelse</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Broforbundne apps"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-hjælpetjenester"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen installerede apps har anmodet om at blive kørt som VR-hjælpetjenester."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillade, at <xliff:g id="SERVICE">%1$s</xliff:g> får adgang til VR-tjenesten?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilselskabets dataopgørelse kan afvige fra enhedens opgørelse."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Omfatter ikke data, der anvendes af mobilnetværk"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Omfatter ikke data, der anvendes af mobilnetværk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Konfigurer dataadvarsel"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dataadvarsel"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Skift driftstilstand for netværket"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Foretrukken netværkstype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilselskab"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version af Indstillinger"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Opkald"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoopkald via mobilselskab"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemvalg"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Tag SIM-kortet ud, og sæt det i igen. Genstart enheden, hvis problemet fortsætter."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv at aktivere SIM-kortet igen. Genstart enheden, hvis problemet fortsætter."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netværksaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Nyt mobilselskab"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryk for at opdatere indstillingerne for SIM-kort"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Skiftet til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5119,7 +5131,7 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidigt utilgængelig"</string>
     <!-- no translation found for calls_sms_no_sim (2336377399761819718) -->
     <skip />
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Præferencer"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netværkspræferencer"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Opret forbindelse til offentlige netværk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netværksforbindelse, internet, trådløs, data, wifi, wi-fi, mobilnetværk, mobil, mobilselskab, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se netværk til flytilstand"</string>
@@ -5133,7 +5145,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Løs problem med forbindelsen"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Tilgængelige netværk i flytilstand"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Afbryd ethernetforbindelsen for at skifte netværk"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke skifte netværk, når du har oprettet forbindelse"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netværk, der kan bruges i flytilstand"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Forbundet"</string>
@@ -5168,4 +5179,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Angiv telefonnummer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillad 2G"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d49aa0e..4f58680 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Lege fest, wie groß Text angezeigt wird."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Verkleinern"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Vergrößern"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"„Automatisch drehen“ verwenden"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Das gesichtsbasierte automatische Drehen verwendet die Frontkamera, um zu erkennen, ob und wie jemand den Bildschirm ansieht. Die Funktion erleichtert das Lesen im Liegen. Die für diese Funktion verwendeten Bilder werden nicht gespeichert oder an Google gesendet.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Weitere Informationen&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Beispieltext"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Der Zauberer von Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapitel 11: Die wundervolle Smaragdstadt von Oz"</string>
@@ -1177,14 +1175,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Suche"</string>
     <string name="display_settings" msgid="7197750639709493852">"Display"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Bildschirm automatisch drehen"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Aus"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"An"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"An – gesichtsbasiert"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gesichtserkennung aktivieren"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farben"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natürlich"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Verstärkt"</string>
@@ -1479,6 +1473,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andere Nutzer"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Gerätespeicher"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mobiler Speicher"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g> belegt"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"von <xliff:g id="TOTAL">%1$s</xliff:g> belegt"</string>
@@ -1740,11 +1744,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Kürzlich hat keine App auf den Standort zugegriffen"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoher Akkuverbrauch"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Geringer Akkuverbrauch"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WLAN- und Bluetooth-Suche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WLAN-Suche"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Apps und Dienste dürfen immer nach WLANs suchen, auch wenn die WLAN-Funktion deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-Suche"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps und Dienste dürfen immer nach Geräten in der Nähe suchen, auch wenn Bluetooth deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Standortdienste für die Arbeit"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zeitzone anhand des Standorts bestimmen"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zeitzone anhand des Standorts bestimmen"</string>
@@ -2145,7 +2150,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Die Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screenreader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audiodienste und Text auf dem Bildschirm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Untertitel"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Bildschirm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text und Anzeige"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bildschirm dunkler machen"</string>
@@ -2298,7 +2306,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-Gelb-Sehschwäche"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Helligkeit verringern"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Das Display dunkler machen als die niedrigste Helligkeit deines Smartphones"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Das Display dunkler machen als die niedrigste Helligkeit deines Tablets"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Mache dein Display dunkler, um beim Lesen die Augen zu schonen.&lt;br/&gt;&lt;br/&gt; Dies kann sinnvoll sein, wenn: &lt;ol&gt; &lt;li&gt; die niedrigste Standardhelligkeit in deinem Smartphone immer noch zu hell ist&lt;/li&gt; &lt;li&gt; du dein Smartphone in dunklen Umgebungen nutzt, wie z. B. nachts oder in einem dunklen Raum vor dem Schlafengehen&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3505,9 +3514,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Klingeltöne"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andere Töne und Vibrationen"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Benachrichtigungen"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Unterhaltung"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Apps, die zuletzt Benachrichtigungen gesendet haben"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Alle der letzten 7 Tage ansehen"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Erweitert"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Allgemein"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Geschäftliche Benachrichtigungen"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive Benachrichtigungen"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive Priorität der Benachrichtigungen"</string>
@@ -3569,7 +3579,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Benachrichtigungen erscheinen in Benachrichtigungs-/Statusleiste und auf Sperrbildschirm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Lautlose Benachrichtigungen in der Statusleiste ausblenden"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Benachrichtigungslicht blinkt"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Benachr. auf Sperrbildschirm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Datenschutz"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sperrbildschirm überspringen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nach Face Unlock direkt zum zuletzt genutzten Bildschirm gehen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sperrbildschirm, überspringen, umgehen"</string>
@@ -3681,13 +3691,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Unterhaltungsbenachrichtigungen"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Warnbenachrichtigungen"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Lautlose Benachrichtigungen"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps, die für diesen Listener nicht überbrückt sind"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alle Apps sind überbrückt"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d Apps sind nicht überbrückt</item>
+      <item quantity="one">%d App ist nicht überbrückt</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Überbrückte Apps"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-Hilfsdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Keine installierte App hat die Ausführung als VR-Hilfedienst angefordert."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-Dienstzugriff für <xliff:g id="SERVICE">%1$s</xliff:g> erlauben?"</string>
@@ -4349,7 +4359,7 @@
       <item quantity="one">1 Beschränkung</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Beinhaltet keine Daten, die in Mobilfunkanbieter-Netzwerken verwendet werden"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Beinhaltet keine von Mobilfunkanbieter-Netzwerken verwendeten Daten"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Verbrauchte Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datenwarnung festlegen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Warnlimit für mobile Daten"</string>
@@ -4893,7 +4903,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Netzmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Bevorzugter Netztyp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilfunkanbieter"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Einstellungen-Version"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Anruffunktionen"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoanrufe über Mobilfunkanbieter"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemauswahl"</string>
@@ -4942,6 +4953,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Versuche, die SIM noch einmal zu aktivieren. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netzwerkaktivierung"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Wechsel des Mobilfunkanbieters"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ist aktiviert"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tippe, um die SIM-Einstellungen zu aktualisieren"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> gewechselt"</string>
@@ -5117,7 +5129,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nicht verfügbar"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentan nicht verfügbar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Keine SIM-Karte"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Einstellungen"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netzwerkeinstellungen"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Mit öffentlichen Netzwerken verbinden"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netzwerkverbindung, internet, kabellos, drahtlos, daten, wlan, w-lan, mobilfunk, mobil, mobilfunkanbieter, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Flugmodus-Netzwerke anzeigen"</string>
@@ -5131,7 +5143,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Konnektivitätsprobleme beheben"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Im Flugmodus verfügbare Netzwerke"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Trenne das Ethernetkabel, um das Netzwerk zu wechseln"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Netzwerkwechsel während einer Verbindung nicht möglich"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugmodus-Netzwerke"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbunden"</string>
@@ -5166,4 +5177,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonnummer eingeben"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer fehlt."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G zulassen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 57bf214..caebb39 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Κάντε το κείμενο στην οθόνη μικρότερο ή μεγαλύτερο."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Να γίνουν μικρότερα"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Να γίνουν μεγαλύτερα"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Χρήση αυτόματης περιστροφής"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Η λειτουργία αυτόματης περιστροφής βάσει προσώπου χρησιμοποιεί την μπροστινή κάμερα για να ελέγξει αν και πώς κάποιος κοιτάει την οθόνη. Επιτρέπει την ανάγνωση όταν είστε ξαπλωμένοι, ενώ οι εικόνες δεν αποθηκεύονται και δεν αποστέλλονται ποτέ στην Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Μάθετε περισσότερα&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Δείγμα κειμένου"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ο Θαυμάσιος Μάγος του Οζ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Κεφάλαιο 11: Η Θαυμάσια Πόλη Έμεραλντ του Οζ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Αναζήτηση"</string>
     <string name="display_settings" msgid="7197750639709493852">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Αυτόματη περιστροφή οθόνης"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Ανενεργό"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ενεργό"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ενεργό - Βάσει προσώπου"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ενεργοπ. ανίχνευσης προσώπων"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Χρώματα"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Φυσικό"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ενισχυμένο"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Άλλοι χρήστες"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Αποθηκευτικός χώρος συσκευής"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Φορητός αποθηκευτικός χώρος"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Σε χρήση <xliff:g id="USED">%1$s</xliff:g> από τα <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Σε χρήση από τα <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Δεν υπάρχουν εφαρμογές που να απέκτησαν πρόσφατα πρόσβαση στην τοποθεσία σας"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Υψηλή χρήση μπαταρίας"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Χαμηλή χρήση μπαταρίας"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Σάρωση Wi‑Fi και Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Σάρωση Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για δίκτυα Wi‑Fi ανά πάσα στιγμή, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Σάρωση Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για κοντινές συσκευές ανά πάσα στιγμή, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Οι υπηρεσίες τοποθεσίας δεν λειτουργούν"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Μπορείτε να προσαρμόσετε αυτήν τη συσκευή σύμφωνα με τις ανάγκες σας. Οι λειτουργίες προσβασιμότητας μπορούν να τροποποιηθούν αργότερα από τις ρυθμίσεις."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Αναγνώστες οθόνης"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ήχος και κείμενο στην οθόνη"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Υπότιτλοι"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ήχος"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Οθόνη"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Κείμενο και προβολή"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Κάντε την οθόνη πιο σκοτεινή"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Μπλε-κίτρινο"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Μείωση φωτεινότητας"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Κάντε την οθόνη πιο σκοτεινή από την ελάχιστη φωτεινότητα του τηλεφώνου σας"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Κάντε την οθόνη πιο σκοτεινή από την ελάχιστη φωτεινότητα του tablet σας"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Κάντε την οθόνη πιο σκοτεινή προκειμένου η ανάγνωση να είναι πιο άνετη.&lt;br/&gt;&lt;br/&gt; Αυτό μπορεί να βοηθήσει: &lt;ol&gt; &lt;li&gt; Όταν η προεπιλεγμένη ελάχιστη φωτεινότητα του τηλεφώνου σας δεν είναι αρκετά σκοτεινή&lt;/li&gt; &lt;li&gt; Όταν χρησιμοποιείτε το τηλέφωνό σας σε συνθήκες χαμηλού φωτισμού, όπως κατά τη διάρκεια της νύχτας ή σε ένα σκοτεινό δωμάτιο πριν κοιμηθείτε&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ήχοι κλήσης"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Άλλοι ήχοι και δονήσεις"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ειδοποιήσεις"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Συνομιλία"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Στάλθηκαν πρόσφατα"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Εμφάνιση όλων από τις τελευταίες 7 ημέρες"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Σύνθετες ρυθμίσεις"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Γενικά"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ειδοποιήσεις εργασίας"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Προσαρμοστικές ειδοποιήσεις"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Προτεραιότητα προσαρμοστικής ειδοποίησης"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Εμφανίζονται στο αναπτυσσόμενο πλαίσιο σκίασης, τη γραμμή κατάστασης και την οθόνη κλειδώματος"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Απόκρυψη αθόρυβων ειδοποιήσεων στη γραμμή κατάστασης"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Φως που αναβοσβήνει"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ειδοποιήσεις στη οθόνη κλειδ."</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Απόρρητο"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Παράβλεψη οθόνης κλειδώματος"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Μετά το Face Unlock, απευθείας μετάβαση στην τελευταία οθόνη"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Οθόνη κλειδώματος, Κλειδωμένη οθόνη, Παράβλεψη, Παράκαμψη"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Ειδοποιήσεις συζήτησης"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Προειδοποιήσεις"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Ειδοποιήσεις σε σίγαση"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Εφαρμογές που δεν έχουν γεφυρωθεί σε αυτήν την υπηρεσία ακρόασης"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Όλες οι εφαρμογές έχουν γεφυρωθεί"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">Δεν έχουν γεφυρωθεί %d εφαρμογές</item>
+      <item quantity="one">Δεν έχει γεφυρωθεί %d εφαρμογή</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Εφαρμογές που έχουν γεφυρωθεί"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Βοηθητικές υπηρεσίες Εικονικής Πραγματικότητας"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Δεν έχει ζητηθεί η εκτέλεση εγκατεστημένων εφαρμογών ως βοηθητικών υπηρεσιών Εικονικής Πραγματικότητας."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Να επιτρέπεται στην υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> να έχει πρόσβαση στην υπηρεσία Εικονικής Πραγματικότητας;"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 περιορισμός</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ο υπολογισμός των δεδομένων από την εταιρεία κινητής τηλεφωνίας μπορεί να διαφέρει από τον υπολογισμό της συσκευής"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Εξαιρούνται δεδομένα που χρησιμοποιούνται από δίκτυα εταιρειών κινητής τηλεφωνίας."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Εξαιρούνται δεδομένα που χρησιμοποιούνται από δίκτυα εταιρειών κινητής τηλεφωνίας."</string>
     <string name="data_used_template" msgid="8229342096562327646">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ορισμός προειδοπ. δεδομένων"</string>
     <string name="data_warning" msgid="2925054658166062884">"Προειδοποίηση δεδομένων"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Προτιμώμενος τύπος δικτύου"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Εταιρεία κινητής τηλεφωνίας"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Έκδοση ρυθμίσεων"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Κλήση"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Επιλογή συστήματος"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Αφαιρέστε τη SIM και τοποθετήστε τη ξανά. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Δοκιμάστε να ενεργοποιήσετε ξανά τη SIM. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ενεργοποίηση δικτύου"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Εναλλαγή εταιρείας κινητής τηλεφωνίας"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Η εταιρεία κινητής τηλεφωνίας <xliff:g id="CARRIER_NAME">%1$s</xliff:g> είναι ενεργή"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Πατήστε για ενημέρωση των ρυθμίσεων SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Έγινε εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"μη διαθέσιμη"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Προσωρινά μη διαθέσιμη"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Δεν υπάρχει SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Προτιμήσεις"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Προτιμήσεις δικτύου"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Σύνδεση σε δημόσια δίκτυα"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wifi, wi-fi, wi fi, δίκτυο κινητής τηλεφωνίας, κινητό, εταιρεία κινητής τηλεφωνίας, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Προβολή δικτύων λειτουργίας πτήσης"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Διόρθωση συνδεσιμότητας"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Διαθέσιμα δίκτυα λειτουργίας πτήσης"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Για εναλλαγή δικτύων, αποσυνδέστε το ethernet."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Δεν είναι δυνατή η εναλλαγή δικτύων όταν είστε συνδεδεμένοι"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Δίκτυα λειτουργίας πτήσης"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Συνδέθηκε"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Εισαγωγή αριθμού τηλεφώνου"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Ο αριθμός τηλεφώνου απουσιάζει."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ΟΚ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Να επιτρέπεται το 2G"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7c1f647..3908190 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -4342,7 +4351,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4886,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
@@ -5124,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
@@ -5159,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index df6900e..2047a0c 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -4342,7 +4351,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Carrier data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4886,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Carrier"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
@@ -5124,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
@@ -5159,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 59c5b47..bc580f9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -4342,7 +4351,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4886,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
@@ -5124,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
@@ -5159,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 378a4cb..ba44a1e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -4342,7 +4351,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4886,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
@@ -5124,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
@@ -5159,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 8c12c8d..d6650bb 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎Other users‎‏‎‎‏‎"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎Device storage‎‏‎‎‏‎"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎Portable storage‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎Alarms and reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎Allow to set alarms or reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎Alarms and reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎Allow this app to schedule alarms or other timing based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction, specifically any alarms that the app has scheduled will no longer work.‎‏‎‎‏‎"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎schedule, alarm, reminder, event‎‏‎‎‏‎"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="USED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎<xliff:g id="UNIT">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎Used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎No apps recently accessed location‎‏‎‎‏‎"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎High battery use‎‏‎‎‏‎"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎Low battery use‎‏‎‎‏‎"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎Wi‑Fi and Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎Wi‑Fi scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎Location Services‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎Location services for work‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎Location time zone detection‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎Location time zone detection‎‏‎‎‏‎"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎You can customize this device to fit your needs. These accessibility features can be changed later in Settings.‎‏‎‎‏‎"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎Change font size‎‏‎‎‏‎"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎Screen readers‎‏‎‎‏‎"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎Audio &amp; on-screen text‎‏‎‎‏‎"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Captions‎‏‎‎‏‎"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎Audio‎‏‎‎‏‎"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎General‎‏‎‎‏‎"</string>
     <string name="display_category_title" msgid="6638191682294461408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎Display‎‏‎‎‏‎"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎Text and display‎‏‎‎‏‎"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Turn screen darker‎‏‎‎‏‎"</string>
@@ -2291,7 +2298,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎Blue-yellow‎‏‎‎‏‎"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎Reduce Brightness‎‏‎‎‏‎"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎Reduce brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎Make screen darker than your phone’s minimum brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎Make screen darker than your tablet’s minimum brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎Make your screen darker so it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;‎‏‎‎‏‎"</string>
@@ -3498,9 +3505,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎Ringtones‎‏‎‎‏‎"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎Other sounds and vibrations‎‏‎‎‏‎"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎Notifications‎‏‎‎‏‎"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎Conversation‎‏‎‎‏‎"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎Recently sent‎‏‎‎‏‎"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎See all from last 7 days‎‏‎‎‏‎"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎Advanced‎‏‎‎‏‎"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎General‎‏‎‎‏‎"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎Work notifications‎‏‎‎‏‎"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎Adaptive notifications‎‏‎‎‏‎"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎Adaptive notification priority‎‏‎‎‏‎"</string>
@@ -3562,7 +3570,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎Display in pull-down shade, status bar &amp; on lock screen‎‏‎‎‏‎"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎Hide silent notifications in status bar‎‏‎‎‏‎"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎Blink light‎‏‎‎‏‎"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎Notifications on lock screen‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎Privacy‎‏‎‎‏‎"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎Skip lock screen‎‏‎‎‏‎"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎After face unlock, go directly to last used screen‎‏‎‎‏‎"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎Lock screen, Lockscreen, Skip, Bypass‎‏‎‎‏‎"</string>
@@ -4342,7 +4350,7 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎1 restriction‎‏‎‎‏‎</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎Carrier data accounting may differ from device accounting‎‏‎‎‏‎"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎Excludes data that is used by carrier networks‎‏‎‎‏‎"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎Excludes data used by carrier networks‎‏‎‎‏‎"</string>
     <string name="data_used_template" msgid="8229342096562327646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used‎‏‎‎‏‎"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎Set data warning‎‏‎‎‏‎"</string>
     <string name="data_warning" msgid="2925054658166062884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎Data warning‎‏‎‎‏‎"</string>
@@ -4886,7 +4894,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎Change the network operating mode‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎Preferred network type‎‏‎‎‏‎"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎Carrier‎‏‎‎‏‎"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎Settings version‎‏‎‎‏‎"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎Carrier settings version‎‏‎‎‏‎"</string>
     <string name="call_category" msgid="641461844504128789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎Calling‎‏‎‎‏‎"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎Carrier video calling‎‏‎‎‏‎"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎System select‎‏‎‎‏‎"</string>
@@ -4935,6 +4943,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎Remove the SIM and insert it again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎Try turning on the SIM again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎Network activation‎‏‎‎‏‎"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎Carrier switching‎‏‎‎‏‎"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active‎‏‎‎‏‎"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎Tap to update SIM settings‎‏‎‎‏‎"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎Switched to ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -5110,7 +5119,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎unavailable‎‏‎‎‏‎"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎Temporarily unavailable‎‏‎‎‏‎"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎No SIM‎‏‎‎‏‎"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎Preferences‎‏‎‎‏‎"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎Network preferences‎‏‎‎‏‎"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎Connect to public networks‎‏‎‎‏‎"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte‎‏‎‎‏‎"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎View airplane mode networks‎‏‎‎‏‎"</string>
@@ -5124,7 +5133,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎Fix connectivity‎‏‎‎‏‎"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎Airplane mode networks available‎‏‎‎‏‎"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎To switch networks, disconnect ethernet‎‏‎‎‏‎"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎Cannot switch networks while connected‎‏‎‎‏‎"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎Airplane mode networks‎‏‎‎‏‎"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="STATE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ / ‎‏‎‎‏‏‎<xliff:g id="NETWORKMODE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎Connected‎‏‎‎‏‎"</string>
@@ -5159,4 +5167,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎Enter Phone number‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎Phone number is missing.‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎Allow 2G‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 69e97d8..a72058c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumenta o reduce el tamaño del texto en pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir el tamaño"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar el tamaño"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar giro automático"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"El giro automático según el rostro usa la cámara frontal para detectar cuando alguien mira a la pantalla y cómo lo hace. Permite la lectura cuando el usuario está acostado, y las imágenes no se almacenan ni se envían a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Más información&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de muestra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El maravilloso mago de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: La maravillosa Ciudad Esmeralda de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Buscar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Girar automáticamente la pantalla"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivada"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activada"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activa - En función del rostro"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Habilitar detección de rostro"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
@@ -1478,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Otros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamiento del dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamiento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir programar alarmas o recordatorios"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permite que esta app programe alarmas y otros eventos de tiempo. Esto permitirá que la app se active y se ejecute incluso cuando no uses el dispositivo. Ten en cuenta que revocar este permiso podría hacer que la app no funcione correctamente, y es posible que las alarmas que haya programado la app dejen de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programar, alarma, recordatorio, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> en uso de <xliff:g id="TOTAL">%2$s</xliff:g> disponibles"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g> disponibles"</string>
@@ -1739,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ninguna app accedió recientemente a tu ubicación"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso de batería alto"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso de batería bajo"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Búsqueda por Wi‑Fi y Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Búsqueda de Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que las apps y los servicios busquen redes Wi-Fi en cualquier momento, aunque la conexión Wi-Fi esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las apps y los servicios busquen dispositivos cercanos en cualquier momento, aunque la conexión Bluetooth esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicios de ubicación"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria de la ubicación"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria de la ubicación"</string>
@@ -2144,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Cambia estas funciones de accesibilidad más tarde en Configuración."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar tamaño de fuente"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto y pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Oscurecer la pantalla"</string>
@@ -2297,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir el brillo"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Oscurecer la pantalla por debajo del brillo mínimo del teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Oscurecer la pantalla por debajo del brillo mínimo de la tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Oscurece la pantalla para que sea más cómodo leer.&lt;br/&gt;&lt;br/&gt; Esto puede ser útil en los siguientes casos: &lt;ol&gt; &lt;li&gt; Cuando incluso el brillo mínimo predeterminado del teléfono es demasiado alto&lt;/li&gt; &lt;li&gt; Cuando usas el teléfono en la oscuridad, por ejemplo, de noche o en una sala oscura antes de dormir&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonos"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificaciones"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversación"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recientemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas las de los últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificaciones de trabajo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificaciones adaptables"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridad de notificación adaptable"</string>
@@ -3568,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar en banner desplegable, barra de estado y pantalla bloqueada"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar las notificaciones silenciosas en la barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificaciones en pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidad"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Después del desbloqueo facial, ir a la última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla bloqueada, bloqueo de pantalla, omitir, omisión"</string>
@@ -3680,13 +3683,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificaciones de conversaciones"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificaciones de alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificaciones silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps que no están conectadas para este usuario"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todas las apps están conectadas"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d apps no están conectadas</item>
+      <item quantity="one">%d app no está conectada</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Apps conectadas"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicio de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna app instalada solicitó que se la ejecutara como servicio de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Quieres permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4351,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo de datos del proveedor puede diferir del que hace el dispositivo."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluye los datos que usan las redes del proveedor"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excluye los datos que usan las redes de los proveedores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Configurar advertencia"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4892,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de red preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Proveedor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión de la configuración"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versión de la configuración del proveedor"</string>
     <string name="call_category" msgid="641461844504128789">"Llamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videollamada con el proveedor"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistema seleccionado"</string>
@@ -4941,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita la SIM y vuelve a insertarla. Si el problema persiste, reinicia el dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Vuelve a activar la SIM. Si el problema persiste, reinicia el dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de red"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio de proveedor"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Presiona para actualizar la configuración de la tarjeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Se cambió a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible por el momento"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hay ninguna tarjeta SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, proveedor de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes para modo de avión"</string>
@@ -5130,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corregir conectividad"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hay redes disponibles para el modo de avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconéctate de Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No puedes cambiar de red si te conectaste a Ethernet"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes del modo de avión"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conexión establecida"</string>
@@ -5165,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ingresa el número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4e8e9f7..6ce41b7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumenta o disminuye el tamaño del texto de la pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir el tamaño"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar el tamaño"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar giro automático"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"El giro automático basado en caras usa la cámara frontal para detectar si hay alguien mirando la pantalla y cómo mira. Así podrás leer mientras estás tumbado. Las imágenes nunca se almacenan ni se envían a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Más información&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de ejemplo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El maravilloso mago de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: La maravillosa Ciudad Esmeralda de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Búsqueda"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Girar pantalla automáticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivar"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activar"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activado: basado en caras"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Habilitar detección de caras"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Otros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamiento del dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamiento portátil"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Usado: <xliff:g id="USED">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ninguna aplicación ha accedido recientemente a la ubicación"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso de batería elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Poco uso de batería"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Búsqueda de Wi‑Fi y Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Búsqueda de redes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que las aplicaciones y los servicios busquen redes Wi‑Fi en cualquier momento aunque la conexión Wi‑Fi esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria por ubicación"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria por ubicación"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad más tarde en Ajustes."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar el tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto y pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Oscurecer pantalla"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir brillo"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Haz que la pantalla sea más oscura que el brillo mínimo del teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Haz que la pantalla sea más oscura que el brillo mínimo del tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Oscurece la pantalla para que te sea más cómodo leer en ella.&lt;br/&gt;&lt;br/&gt; Esta opción puede resultar útil en estos casos: &lt;ol&gt; &lt;li&gt; Hay demasiado brillo aun con el ajuste del teléfono en el valor mínimo&lt;/li&gt; &lt;li&gt; Estás usando el teléfono en la oscuridad; por ejemplo, porque es de noche o porque estás en una habitación oscura antes de irte a la cama&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonos de llamada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificaciones"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversación"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recientemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver las de los últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificaciones de trabajo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificaciones adaptativas"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridad de notificaciones adaptable"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Se muestra en el desplegable, la barra de estado y la pantalla de bloqueo"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"No mostrar notificaciones silenciosas en la barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz parpadeante"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificaciones en la pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidad"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltar pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Después del desbloqueo facial, ir a la última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, pantalla bloqueo, saltar, evitar"</string>
@@ -3678,15 +3688,15 @@
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificaciones permitidas"</string>
     <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificaciones continuas importantes"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificaciones de conversaciones"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificaciones de alerta"</string>
+    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificaciones de alertas"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificaciones silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplicaciones que no están vinculadas a este receptor"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todas las aplicaciones están vinculadas"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplicaciones no están vinculadas</item>
+      <item quantity="one">%d aplicación no está vinculada</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplicaciones vinculadas"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicios de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna aplicación instalada ha solicitado ejecutarse como servicios de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo del uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No se incluyen los datos utilizados en redes de operadores"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"No incluye datos usados en redes de operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usados"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Establecer advertencia de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de red preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión de Ajustes"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Llamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videollamadas a través del operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selección del sistema"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Extrae la tarjeta SIM e insértala de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prueba a activar la tarjeta SIM de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de la red"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambiando de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para actualizar los ajustes de la tarjeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Se ha pasado a usar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sin tarjeta SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, operador de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes disponibles en el modo avión"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Arreglar conectividad"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes disponibles en el modo avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconecta el cable Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No se puede cambiar de red con el dispositivo conectado"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para modo avión"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introducir número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir el 2G"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 12b8cba..996464c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Muutke ekraanil kuvatavat teksti suuremaks või väiksemaks."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Vähendamine"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Suurendamine"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Kasuta automaatset pööramist"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Näopõhine automaatne pööramine tuvastab esikaamera abil, kas keegi vaatab ekraani ja mis asendis ta on. See muudab pikutades lugemise mugavamaks. Pilte ei salvestata ega saadeta mitte kunagi Google\'ile.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lisateave&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Näidistekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Võlur Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. peatükk: Ozi imeline smaragdlinn"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Otsing"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekraan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Pööra ekraani automaatselt"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Väljas"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Sees"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Sees – näopõhine"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Luba näotuvastus"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värvid"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Loomulikud"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Võimendatud"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Teised kasutajad"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Seadme salvestusruum"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Kaasaskantav salvestusruum"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Kasutatud <xliff:g id="USED">%1$s</xliff:g> <xliff:g id="TOTAL">%2$s</xliff:g>-st"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Kasutatud <xliff:g id="TOTAL">%1$s</xliff:g>-st"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ükski rakendus ei ole hiljuti asukohale juurde pääsenud"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Suur akukasutus"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Madala tarbimisega akukasutus"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WiFi ja Bluetoothi skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WiFi-skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Lubage rakendustel ja teenustel alati otsida WiFi-võrke, isegi kui WiFi on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothi skannimine"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lubage rakendustel ja teenustel alati otsida läheduses olevaid seadmeid, isegi kui Bluetooth on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Asukohateenused töö jaoks"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Asukohapõhine ajavööndi tuvastamine"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Asukohapõhine ajavööndi tuvastamine"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Seadet saab kohandada vastavalt oma vajadustele. Neid juurdepääsetavuse funktsioone saab hiljem muuta menüüs Seaded."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Muutke fondi suurust"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekraanilugejad"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Heli ja ekraanil kuvatud tekst"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtiitrid"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Heli"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekraan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst ja ekraanikuva"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekraanikuva muutmine tumedamaks"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Punane-roheline"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Punane-roheline"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sinine-kollane"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Ereduse vähendamine"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Muutke ekraanikuva pimedamaks kui teie telefoni miinimumeredus"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Muutke ekraanikuva pimedamaks kui teie tahvelarvuti miinimumeredus"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Muutke ekraanikuva tumedamaks, et seda oleks mugavam lugeda.&lt;br/&gt;&lt;br/&gt; See võib olla kasulik järgmistel juhtudel. &lt;ol&gt; &lt;li&gt; Teie telefoni vaikemiinimumheledus on siiski liiga ere.&lt;/li&gt; &lt;li&gt; Kasutate oma telefoni pimedas, näiteks öösel või pimedas ruumis enne magamaminekut.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Helinad"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Muud helid ja värinad"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Märguanded"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Vestlus"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Hiljuti saadetud"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Kuva kõik viimase 7 päeva kohta"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Täpsemad"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Üldine"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Töö märguanded"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Kohanduvad märguanded"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Kohanduvate märguannete prioriteet"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Kuva allatõmmatavas menüüs, olekuribal ja lukustuskuval"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Peida vaiksed märguanded olekuribal"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuv tuli"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Märguanded lukustuskuval"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privaatsus"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukustuskuva vahelejätmine"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pärast Face Unlocki kasutamist avaneb viimati vaadatud kuva"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukustuskuva, lukustuskuva, vahelejätmine, mittekasutamine"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Vestluste märguanded"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Hoiatusmärguanded"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Hääletud märguanded"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Rakendused, mis pole selle kuulajaga sillatud"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Kõik rakendused on sillatud"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d rakendust pole sillatud</item>
+      <item quantity="one">%d rakendus pole sillatud</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Sillatud rakendused"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-abilise teenused"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ükski installitud rakendus pole taotlenud VR-abilise teenusena käitamist."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Kas lubada VR-teenuse juurdepääs teenusele <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 piirang</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaatori andmemahuarvestus võib erineda seadme andmemahuarvestusest"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Välistab andmed, mida kasutatakse operaatorite võrkude kaudu"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Välistab operaatorite võrkude kasutatavad andmed"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_warning" msgid="2925054658166062884">"Andmemahu hoiatus"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Võrgu töörežiimi muutmine"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Eelistatud võrgutüüp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operaator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Seadete versioon"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Helistamine"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operaatori videokõne"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Süsteemi valimine"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Eemaldage SIM-kaart ja sisestage uuesti. Kui probleem jätkub, taaskäivitage seade."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Lülitage SIM-kaart uuesti sisse. Kui probleem jätkub, taaskäivitage seade."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Võrgu aktiveerimine"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operaatori vahetamine"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivne"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Puudutage SIM-kaardi seadete värskendamiseks"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Lülituti operaatorile <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"pole saadaval"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pole ajutiselt saadaval"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kaarti pole"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Eelistused"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Võrgueelistused"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ühenda avalike võrkudega"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"võrguühendus, internet, juhtmeta, andmeside, wifi, wi-fi, wi fi, mobiilside, mobiilsideoperaator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Kuva lennukirežiimi võrgud"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Ühenduvuse parandamine"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Saadaolevad lennukirežiimi võrgud"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Võrkude vahetamiseks katkestage Etherneti-ühendus"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ühenduse korral ei saa võrku vahetada"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lennukirežiimi võrgud"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ühendatud"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Sisestage telefoninumber"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoninumber puudub."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Luba 2G"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0afc574..09fa2c4 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Handitu edo txikitu pantailako testua."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Txikitu"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Handitu"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Erabili Automatikoki biratu"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Aurpegian oinarritutako Automatikoki biratu eginbideak aurreko kamera erabiltzen du inor pantailara begira dagoen eta nola begiratzen duen jakiteko. Etzanda irakurtzeko aukera ematen du, eta irudiak ez dira gordetzen, ez eta Google-ri bidaltzen ere.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lortu informazio gehiago&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Testu-lagina"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ozeko azti miragarria"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
@@ -951,7 +949,7 @@
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Konektatzen…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partekatu wifi-gunea"</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_wifi_password" msgid="4992986319806934381">"Wifi-sareko pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wifi-gunearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Konexio automatikoa"</string>
     <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Baimendu sare honetara konektatzea barrutian dagoenean"</string>
@@ -965,7 +963,7 @@
     <string name="wifi_multiple_cert_added" msgid="2151019652853383776">"(Ziurtagiri batzuk gehitu dira)"</string>
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ez zehaztu"</string>
-    <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez balidatu"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez baliozkotu"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeinua zehaztu behar da."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Ziurtagiria behar da."</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Bilaketa"</string>
     <string name="display_settings" msgid="7197750639709493852">"Bistaratzea"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Biratu pantaila automatikoki"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desaktibatuta"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktibatuta"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktibatuta: aurpegian oinarrituta"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gaitu Aurpegi-hautematea"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Koloreak"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalak"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Nabarmenduak"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Beste erabiltzaileak"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Gailuaren memoria"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Memoria-unitate eramangarriak"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>} erabilitakoa"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ez dago kokapena berriki atzitu duen aplikaziorik"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Bateria-erabilera handia"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Bateria-erabilera txikia"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wifi-sareen bilaketa eta Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wifi-sareen bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Eman wifi-sareak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita wifi-konexioa desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetooth-a desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lanerako kokapen-zerbitzuak"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Kokapeneko ordu-zona hautemateko aukera"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Kokapeneko ordu-zona hautemateko aukera"</string>
@@ -1897,7 +1902,7 @@
     <string name="forgot_password_text" msgid="2583194470767613163">"PIN kodea, eredua edo pasahitza berrezartzen lagunduko dizu"</string>
     <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
     <string name="install_all_warning" product="default" msgid="652516435709047343">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
-    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartuko duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
+    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Gaitu ezarpenen aukera gehiago"</string>
     <string name="application_info_label" msgid="1015706497694165866">"Aplikazioen informazioa"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Aldatu letra-tamaina"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pantaila-irakurgailuak"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioa eta pantailako testua"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Azpitituluak"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audioa"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Pantaila"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Testua eta pantaila"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ilundu pantaila"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Gorri-berdea"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Gorri-berdea"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Urdin-horia"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Murriztu distira"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ilundu pantaila telefonoaren gutxieneko distiratik harago"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ilundu pantaila tabletaren gutxieneko distiratik harago"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ilundu pantaila, irakurtzeko erosoagoa izan dadin.&lt;br/&gt;&lt;br/&gt; Kasu hauetan izan daiteke lagungarria: &lt;ol&gt; &lt;li&gt; Gutxieneko balio lehenetsia ezarrita ere telefonoaren distira argiegia denean.&lt;/li&gt; &lt;li&gt; Telefonoa ilunpean erabiltzen ari zarenean (adibidez, gauez edo oheratu aurretik logela ilun dagoenean).&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -2766,7 +2775,7 @@
     <string name="backup_section_title" msgid="6539706829848457794">"Babeskopiak eta leheneratzea"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Datu pertsonalak"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Egin nire datuen babeskopia"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Egin datuen, wifi-sareen pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Egin datuen, wifi-sareetako pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"Babesk. gordetzeko kontua"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"Kudeatu babeskopiak gordetzeko kontua"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Sartu aplikazioetako datuak"</string>
@@ -2775,7 +2784,7 @@
     <string name="backup_inactive_title" msgid="6753265378043349277">"Babeskopia-zerbitzua ez dago aktibo"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Ez dago babeskopiak gordetzen dituen aplikaziorik"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Wifi-sareen pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google-ren zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Wifi-sareetako pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google-ren zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Gailuko datuen (adibidez, Wi-Fi pasahitzak eta deien historia) eta aplikazioetako datuen (besteak beste, ezarpenak eta aplikazioek gordetako fitxategiak) babeskopiak egiteari utzi nahi diozu eta urruneko zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_data_summary" msgid="971587401251601473">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzaileen ezarpenen arabera), eta kontuzkoak izan litezkeen datuak ere sar daitezke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Gailua administratzeko aplikazioaren ezarpenak"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonuak"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Beste soinu eta dardara batzuk"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Jakinarazpenak"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Elkarrizketa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Bidalitako azkenak"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ikusi azken zazpi egunetako guztia"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Aurreratuak"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Orokorrak"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Laneko jakinarazpenak"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Jakinarazpen doigarriak"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Jakinarazpenen lehentasun doigarria"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bistaratu goitibeherako barran, egoera-barran eta pantaila blokeatuan"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ezkutatu soinurik gabeko jakinarazpenak egoera-barran"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Argi keinukaria"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pantaila blokeatua"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Pribatutasuna"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltatu pantaila blokeatua"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Aurpegiaren bidez desblokeatu ondoren, joan zuzenean erabili duzun azken pantailara"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantaila blokeatua, blokeo pantaila, saltatu, zeharbidea"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Elkarrizketei buruzko jakinarazpenak"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Jakinarazpen ohartarazleak"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Soinurik gabeko jakinarazpenak"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Hautemaile honentzat zubi moduan ez dauden aplikazioak"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Aplikazio guztiak daude zubi moduan"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplikazio ez daude zubi moduan</item>
+      <item quantity="one">%d aplikazio ez dago zubi moduan</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Zubi moduan dauden aplikazioak"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Errealitate birtualeko laguntza-zerbitzuak"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 murriztapen</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Agian ez dira bat etorriko gailuak eta operadoreak egindako datu-kontsumoen neurketak"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ez dira hartzen kontuan operadorearen sareek erabilitako datuak"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ez dira sartzen operadoreen sareek erabilitako datuak"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> erabilita"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ezarri datuen erabileraren abisua"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datuen erabileraren abisua"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Aldatu sare modua"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Sare mota lehenetsia"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadorea"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ezarpenen bertsioa"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Deiak"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operadorearen bideo-deiak"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemaren hautapena"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Saiatu berriro SIM txartela aktibatzen. Arazoak badirau, berrabiarazi gailua."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Sarearen aktibazioa"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operadore-aldaketa"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo dago <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Sakatu hau SIM txartelarenaren ezarpenak eguneratzeko"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatu zara"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ez dago erabilgarri"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ez dago erabilgarri aldi baterako"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ez dago SIM txartelik"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Hobespenak"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Sarearen hobespenak"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Konektatu sare publikoetara"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sareko konexioa, internet, hari gabeko konexioak, datuak, wifia, mugikorra, telefono mugikorra, operadorea, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ikusi hegaldi moduko sareak"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Konpondu konexioa"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hegaldi moduko sareak erabilgarri daude"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Sarez aldatzeko, deskonektatu Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ezin da aldatu sarea konektatuta zauden bitartean"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Hegaldi modurako sareak"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Konektatuta"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Idatzi telefono-zenbakia"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefono-zenbakia falta da."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Ados"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Eman 2G erabiltzeko baimena"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 83c2395..43504c9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"نوشتار روی صفحه‌نمایش را بزرگ‌تر یا کوچک‌تر کنید."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"کوچک‌تر کردن"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"بزرگ‌تر کردن"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"استفاده از چرخش خودکار"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"‏«چرخش خودکار براساس چهره» بااستفاده از دوربین جلو تشخیص می‌دهد که آیا فردی درحال تماشای صفحه‌نمایش است یا نه و چگونه به صفحه نگاه می‌کند. این ویژگی امکان مطالعه را هنگام دراز کشیدن فراهم می‌کند و تصاویر هرگز ذخیره نمی‌شوند یا به Google ارسال نمی‌شوند.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;بیشتر بدانید&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نوشتار نمونه"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"جادوگر شهر اوز"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"فصل ۱۱: شهر زمردی شگفت‌انگیز اوز"</string>
@@ -755,7 +753,7 @@
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"فراموش کردن دستگاه"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"اتصال به..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای رسانه قطع می‌شود."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای هندزفری قطع می‌شود."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از حالت صوتی دست‌آزاد قطع می‌شود."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از دستگاه ورودی قطع می‌شود."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"دسترسی به اینترنت از طریق <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع خواهد شد."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از هم‌رسانی اتصال اینترنتی این رایانهٔ لوحی قطع خواهد شد."</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"جستجو"</string>
     <string name="display_settings" msgid="7197750639709493852">"صفحه‌نمایش"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"چرخش خودکار صفحه"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"خاموش"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"روشن"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"روشن - براساس چهره"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"فعال کردن «تشخیص چهره»"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ‌"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبیعی"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"تقویت‌شده"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"کاربران دیگر"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"دستگاه ذخیره‌سازی"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"دستگاه ذخیره‌سازی قابل حمل"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g> مصرف شد"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"‏ <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"از <xliff:g id="TOTAL">%1$s</xliff:g> مصرف شد"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"اخیراً برنامه‌ای به مکان دسترسی نداشته است"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"استفاده زیاد از باتری"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"استفاده کم از باتری"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏اسکن کردن Wi‑Fi و بلوتوث"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏اسکن کردن Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی Wi‑Fi خاموش است) شبکه‌های Wi‑Fi را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"اسکن کردن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات مکان برای کار"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این ویژگی‌های دسترس‌پذیری را تغییر دهید."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"تغییر اندازه قلم"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"صفحه‌خوان‌ها"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"صدا و نوشتار روی صفحه"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"زیرنویس"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"صوتی"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"نمایشگر"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"نوشتار و نمایشگر"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"تیره‌تر کردن صفحه"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"قرمز-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"قرمز-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"آبی-زرد"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"کاهش روشنایی"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"صفحه تیره‌تر از حداقل روشنایی تلفن شود"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"صفحه تیره‌تر از حداقل روشنایی رایانه لوحی شود"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏صفحه را تیره‌تر کنید تا خواندن راحت‌تر باشد.&lt;br/&gt;&lt;br/&gt; این کار در موارد زیر می‌تواند مفید باشد: &lt;ol&gt; &lt;li&gt; حداقل روشنایی پیش‌فرض تلفن همچنان خیلی روشن باشد&lt;/li&gt; &lt;li&gt; از تلفن در شرایط تاریک استفاده کنید، برای مثال در شب یا در اتاقی تاریک قبل‌از خواب&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"آهنگ‌های زنگ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"صداها و لرزش‌های دیگر"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"اعلان‌ها"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"مکالمه"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"اخیراً ارسال‌شده"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"مشاهده همه موارد از ۷ روز پیش"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"پیشرفته"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"کلی"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"اعلان‌های کار"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"اعلان‌های تطبیقی"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"اولویت اعلان تطبیقی"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"در کشوی اعلان‌های پایین‌پر، نوار وضعیت و صفحه قفل نشان داده می‌شود"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"پنهان کردن اعلان‌های ساکت در نوار وضعیت"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"نور چشمک‌زن"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"اعلان‌ها در صفحه قفل"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"حریم‌خصوصی"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"رد کردن صفحه قفل"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"پس از «بازگشایی با چهره»، مستقیم به آخرین صفحه استفاده‌شده می‌روید"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"صفحه قفل، صفحه‌قفل، رد کردن، نادیده گرفتن"</string>
@@ -3638,7 +3648,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"وقفه‌ها مجاز شوند"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"به برنامه اجازه پخش صدا، لرزش و/یا نمایش اعلان‌های بازشو در صفحه‌نمایش داده شود"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"اولویت"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"در بالای بخش مکالمه به‌صورت حبابک شناور نشان داده می‌شود و تصویر نمایه را در صفحه قفل نمایش می‌دهد"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"در بالای بخش مکالمه به‌صورت حبابک شناور نشان داده می‌شود و عکس نمایه را در صفحه قفل نمایش می‌دهد"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> از اکثر ویژگی‌های مکالمه پشتیبانی نمی‌کند. نمی‌توانید مکالمه‌ای را به‌عنوان اولویت‌دار تنظیم کنید و مکالمه‌ها به‌صورت حبابک شناور نشان داده نمی‌شوند."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"در اعلان‌های پایین‌پر تیره و کوچک در یک سطر"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"بدون صدا یا لرزش"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"اعلان‌های مکالمه"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"اعلان‌های هشداردهنده"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"اعلان‌های بی‌صدا"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"برنامه‌هایی که به این شنونده متصل نشده‌اند"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"همه برنامه‌ها متصل شده‌اند"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">‏%d برنامه متصل نشده‌اند</item>
+      <item quantity="other">‏%d برنامه متصل نشده‌اند</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"برنامه‌های متصل"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏خدمات یاور VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏هیچ برنامه نصب‌شده‌ای درخواست نکرده به‌عنوان خدمات یاور VR اجرا شود."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏به <xliff:g id="SERVICE">%1$s</xliff:g> امکان داده شود به خدمات VR دسترسی یابد؟"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> محدودیت</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"روش شرکت مخابراتی برای اندازه‌گیری مصرف داده ممکن است با روش دستگاهتان متفاوت باشد."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"داده‌هایی را که شبکه‌های شرکت مخابراتی استفاده می‌کنند لحاظ نمی‌کند"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"داده‌هایی را که شبکه‌های شرکت مخابراتی استفاده می‌کنند لحاظ نمی‌کند"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مصرف شده"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"تنظیم هشدار داده"</string>
     <string name="data_warning" msgid="2925054658166062884">"هشدار داده"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"تغییر حالت عملکرد شبکه"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"نوع شبکه برگزیده"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"شرکت مخابراتی"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"نسخه تنظیمات"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"درحال تماس"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"تماس تصویری با شرکت مخابراتی"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"انتخاب سیستم"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"سیم‌کارت را خارج کنید و دوباره در دستگاه بگذارید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"سیم‌کارت را دوباره روشن کنید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"فعال‌سازی شبکه"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"تغییر شرکت مخابراتی"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال است"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"برای به‌روزرسانی تنظیمات سیم‌کارت ضربه بزنید"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> جابه‌جا شدید"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"دردسترس نیست"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"موقتاً دردسترس نیست"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"سیم‌کارتی وجود ندارد"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"اولویت‌ها"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"اولویت‌های شبکه"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"اتصال به شبکه‌های عمومی"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏اتصال شبکه، اینترنت، بی‌سیم، داده، wifi،‏ wi-fi، ‏wi fi، شبکه تلفن همراه، تلفن همراه، شرکت مخابراتی تلفن همراه، 4g،‏ 3g،‏ 2g،‏ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"مشاهده شبکه‌های حالت هواپیما"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"رفع مشکل اتصال"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"شبکه‌های حالت هواپیما دردسترس‌اند"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"برای تغییر شبکه، اترنت را قطع کنید"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"هنگامی که اتصال برقرار است نمی‌توان شبکه‌ها را عوض کرد"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"شبکه‌های «حالت هواپیما»"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصل است"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"وارد کردن شماره تلفن"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"شماره تلفن وارد نشده است."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"تأیید"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏مجاز کردن 2G"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 955c972..e4e321b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Suurenna tai pienennä tekstiä näytöllä."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pienennä"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Suurenna"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Käytä automaattista kääntöä"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automaattinen kääntö kasvojen perusteella näkee etukameralla, katsooko joku näyttöä ja mistä suunnasta. Se mahdollistaa lukemisen makuuasennossa, ja kuvia ei koskaan tallenneta tai lähetetä Googlelle.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lue lisää&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Esimerkkiteksti"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ihmemaa Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Luku 11: Ozin ihastuttava smaragdikaupunki"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Haku"</string>
     <string name="display_settings" msgid="7197750639709493852">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Näytön automaattinen kierto"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Poissa päältä"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Päällä"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Päällä – kasvojen perusteella"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ota kasvojentunnistus käyttöön"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värit"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Luonnollinen"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Tehostettu"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Muut käyttäjät"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Laitteen tallennustila"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Kannettava tallennustila"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Päällä <xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Tallennustilasta (<xliff:g id="TOTAL">%1$s</xliff:g>) käytössä"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Sovellukset eivät ole käyttäneet sijaintia äskettäin"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Suuri akun kulutus"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Vähäinen akun kulutus"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi- ja Bluetooth-haku"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-haku"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Salli sovellusten ja palvelujen hakea Wi‑Fi-verkkoja aina, vaikka Wi-Fi olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-haku"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Salli sovellusten ja palvelujen hakea lähellä olevia laitteita aina, vaikka Bluetooth olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Sijaintipalvelut työkäyttöön"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Sijainnin aikavyöhykkeen tunnistus"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Sijainnin aikavyöhykkeen tunnistus"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Muuta fonttikokoa"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Näytönlukuohjelmat"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ääni ja näyttöteksti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Tekstitykset"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Näyttö"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksti ja näyttö"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Tummenna näyttöä"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sini-keltasokeus"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Vähennä kirkkautta"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Tummenna näyttöä puhelimen vähimmäiskirkkautta tummemmaksi"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Tummenna näyttöä tabletin vähimmäiskirkkautta tummemmaksi"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Tummenna näyttöä, jotta sen lukeminen on miellyttävämpää.&lt;br/&gt;&lt;br/&gt; Tästä voi olla apua, kun &lt;ol&gt; &lt;li&gt; puhelin on liian kirkas, vaikka kirkkauden oletusvähimmäisarvo on valittuna&lt;/li&gt; &lt;li&gt; käytät puhelinta pimeässä, esimerkiksi yöllä tai pimeässä huoneessa ennen nukkumaanmenoa&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Soittoäänet"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Muut äänet ja värinä"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ilmoitukset"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Keskustelu"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Äskettäin lähetetyt"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Näytä kaikki 7 viime päivän ajalta"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Lisäasetukset"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Yleiset"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Työilmoitukset"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Mukautuvat ilmoitukset"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Mukautuva ilmoitusten tärkeys"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Näytä vedettävällä ilmoitusalueella, tilapalkissa ja lukitusnäytöllä"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Piilota hiljaiset ilmoitukset tilapalkista"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuta valoa"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ilmoitukset lukitusnäytöllä"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Tietosuoja"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukitusnäytön ohittaminen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Siirry Face Unlockin jälkeen suoraan viimeisimmälle näytölle"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukitusnäyttö, ohita"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Keskusteluilmoitukset"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Ääni-ilmoitukset"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Hiljaiset ilmoitukset"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Sovellukset, jotka eivät ole siltaavia tälle käyttäjälle"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Kaikki sovellukset ovat siltaavia"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d sovellusta ei ole siltaavia</item>
+      <item quantity="one">%d sovellus ei ole siltaava</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Siltaavat sovellukset"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-avustinpalvelut"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asennettuja sovelluksia ei ole pyydetty toimimaan VR-avustinpalveluina."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Sallitaanko VR-palveluiden käyttöoikeus palvelulle <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 rajoitus</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaattorin mittaama datan määrä voi erota laitteen mittaustuloksesta."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ei sisällä operaattoriverkkojen käyttämää dataa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ei sisällä operaattoriverkkojen käyttämää dataa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Aseta datankäyttövaroitus"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavaroitus"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Vaihda verkon käyttötilaa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ensisijainen verkko"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operaattori"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Asetusten versio"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Puhelut"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videopuheluiden operaattori"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Valitse järjestelmä"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Poista SIM-kortti ja aseta se takaisin. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Kokeile kytkeä SIM-kortti päälle uudelleen. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Verkon aktivointi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operaattorin vaihto"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivinen"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Päivitä SIM‑asetukset napauttamalla"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> otettiin käyttöön"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ei saatavilla"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tilapäisesti poissa käytöstä"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ei SIM-korttia"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Valinnat"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Verkkoasetukset"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Yhdistä julkisiin verkkoihin"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"verkkoyhteys, internet, langaton, data, langaton yhteys, Wi-Fi, Wi Fi, datayhteys, mobiili, puhelinoperaattori, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Näytä lentokonetilan verkot"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Korjaa yhteysongelmat"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lentokonetilan verkkoja saatavilla"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Vaihda verkkoa irrottamalla Ethernet-johto"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Verkkoa ei voi vaihtaa verkkoyhteyden ollessa päällä"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lentokonetila verkot"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Yhdistetty"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Lisää puhelinnumero"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Puhelinnumero puuttuu."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Salli 2G"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c917577..80116b9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Autres utilisateurs"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Mémoire interne de l\'appareil"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mémoire de stockage externe"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilisé(s) sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune application n\'a récemment accédé à la position"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Forte utilisation de la pile"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Faible utilisation de la pile"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Recherche Wi‑Fi et Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Recherche de réseaux Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applications et les services à rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche d\'appareils Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sous-titres"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Affichage"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texte et affichage"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Réduire la luminosité"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Assombrissez l\'écran de votre téléphone davantage que sa luminosité minimale"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Assombrissez l\'écran de votre tablette davantage que sa luminosité minimale"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Assombrissez votre écran pour qu\'il soit plus facile à lire.&lt;br/&gt;&lt;br/&gt; Cela peut être pratique dans certains cas : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre téléphone est quand même trop intense&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans un environnement sombre, comme la nuit ou dans une salle sombre avant d\'aller vous coucher&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sonneries"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Autres sons et vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Envoyées récemment"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tout afficher depuis les sept derniers jours"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Paramètres avancés"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Général"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifications professionnelles"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifications adaptatives"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorité adaptative pour les notifications"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affiche dans le volet déroulant, dans la barre d\'état et sur l\'écran de verrouillage"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Masquer les notifications silencieuses dans la barre d\'état"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Faire clignoter le voyant"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notif. sur l\'écran verrouillé"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidentialité"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorer l\'écran de verrouillage"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Après le déverr. par rec. faciale, aller au dernier écran util."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, écran verrouillé, ignorer, contourner"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notifications de conversations"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notifications d\'alerte"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notifications silencieuses"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Applications qui ne sont plus reliées à cet auditeur"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Toutes les applications sont reliées"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d application n\'est pas reliée</item>
+      <item quantity="other">%d applications ne sont pas reliées</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Applications reliées"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Services d\'assistance de réalité virtuelle"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune demande d\'exécution en tant que services de soutien de réalité virtuelle n\'a été envoyée pour les applications installées."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder au service de réalité virtuelle?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données utilisées sur les réseaux cellulaires sont exclues"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclut les données utilisées sur les réseaux cellulaires"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Activer une alerte"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'alerte"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Type de réseau préféré"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Fournisseur de services"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version des paramètres"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Appels"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Appels vidéo par l\'entremise du fournisseur de services"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sélection système"</string>
@@ -4909,7 +4926,7 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation d\'une carte SIM?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à la carte SIM?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Une seule carte SIM téléchargée peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer à un autre réseau n\'annulera pas votre service auprès de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM, puis réinsérez-la. Si le problème persiste, redémarrez votre appareil."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Réessayer d\'activer la carte SIM. Si le problème persiste, redémarrez votre appareil."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Changement de fournisseur de services en cours…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Touchez l\'écran pour mettre à jour les paramètres de la carte SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Vous êtes passé au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non accessible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément inaccessible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, fournisseur cellulaire, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Dépanner la connectivité"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux accessibles en mode Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, débranchez le câble Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau, alors que vous êtes connecté"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux compatibles avec le mode Avion"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> : <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connexion active"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Entrer le numéro de téléphone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Le numéro de téléphone est manquant."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Autoriser les réseaux 2G"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 76ffcc7..89c8590 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Autres utilisateurs"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Mémoire de l\'appareil"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mémoire de stockage externe"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilisé(s) sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Utilisés sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune application n\'a récemment accédé à la position"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Faible utilisation de batterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Recherche Wi‑Fi et Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Recherche Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applications et les services à rechercher des réseaux Wi-Fi à tout moment, même si le Wi-Fi est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sous-titres"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Écran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Annonces textuelles et display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
@@ -2282,7 +2296,7 @@
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Ce service ne fonctionne pas. Appuyez ici pour en savoir plus."</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"Ce service ne fonctionne pas."</string>
     <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Raccourcis d\'accessibilité"</string>
-    <string name="enable_quick_setting" msgid="6648073323202243604">"Afficher dans la fenêtre de configuration rapide"</string>
+    <string name="enable_quick_setting" msgid="6648073323202243604">"Afficher dans les Réglages rapides"</string>
     <string name="daltonizer_type" msgid="1715154680803795947">"Mode de correction"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Réduire la luminosité"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Assombrir l\'écran au-delà du niveau minimal de luminosité de votre téléphone"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Assombrir l\'écran au-delà du niveau minimal de luminosité de votre tablette"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Assombrissez l\'écran pour améliorer votre confort de lecture.&lt;br/&gt;&lt;br/&gt; Cela peut être utile quand : &lt;ol&gt; &lt;li&gt; Même le niveau minimal de luminosité par défaut de votre téléphone est trop lumineux.&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans l\'obscurité, par exemple la nuit ou dans une pièce sombre avant de vous coucher.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3467,7 +3482,7 @@
     <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_duration" msgid="7515850842082631460">"Durée du mode en Configuration rapide"</string>
+    <string name="zen_category_duration" msgid="7515850842082631460">"Durée pour les Réglages rapides"</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_custom_settings_dialog_title" msgid="4613603772432720380">"Paramètres personnalisés"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Examiner une programmation"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sonneries"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Autres sons et vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Envoyées récemment"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tout afficher depuis les sept derniers jours"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Paramètres avancés"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Général"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifications profil pro"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifications intelligentes"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorité des notifications intelligentes"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affichent dans le volet des notifications, la barre d\'état et sur l\'écran de verrouillage"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Masquer les notifications silencieuses dans la barre d\'état"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Clignotement"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications sur l\'écran de verrouillage"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidentialité"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorer l\'écran de verrouillage"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Après le déverrouillage via Face Unlock, accéder au dernier écran utilisé"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, verrouiller l\'écran, passer, ignorer"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notifications de conversation"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notifications d\'alerte"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notifications silencieuses"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Applis non associées à cet écouteur"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Toutes les applications sont associées"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d application n\'est pas associée</item>
+      <item quantity="other">%d applications ne sont pas associées</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Applications associées"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Assistance réalité virtuelle"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune demande d\'exécution en tant que service d\'assistance pour la réalité virtuelle n\'a été envoyée pour les applications installées."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder au service de réalité virtuelle ?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de votre opérateur peut différer de celui qui est effectué sur votre appareil."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données consommées via les réseaux d\'opérateurs sont exclues"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Les données consommées via les réseaux d\'opérateurs sont exclues"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Définir un seuil d\'avertissement"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'avertissement"</string>
@@ -4465,7 +4481,7 @@
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Essayer le thème sombre"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Améliore l\'autonomie de la batterie"</string>
-    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Tuiles de configuration rapide pour les développeurs"</string>
+    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Blocs Réglages rapides pour les développeurs"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Désactiver délai d\'expiration autorisation adb"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Désactiver le retrait automatique des autorisations adb pour des systèmes qui ne se sont pas connectés dans les délais par défaut (7 jours) ou dans un délai défini par l\'utilisateur (1 jour minimum)."</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"Trace Winscope"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Type de réseau préféré"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Opérateur"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version des paramètres"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Appels"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Appels vidéo via l\'opérateur"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sélection système"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM et insérez-la de nouveau. Si le problème persiste, redémarrez l\'appareil."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Essayez à nouveau d\'activer la carte SIM. Si le problème persiste, redémarrez l\'appareil."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Changement d\'opérateur…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Appuyez pour mettre à jour les paramètres de la carte SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Nouveau réseau : <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5083,7 +5101,7 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser superpositions d\'écran dans paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autoriser les applications pouvant se superposer à d\'autres à se superposer aux écrans de paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans la fenêtre de configuration rapide"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans les Réglages rapides"</string>
     <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément indisponible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, opérateur mobile, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corriger la connectivité"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux disponibles en mode Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, déconnectez l\'Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau en étant connecté"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux du mode Avion"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connecté"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Saisir le numéro de téléphone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numéro de téléphone manquant."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Autoriser la 2G"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c2ceeab..d401a19 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Reduce ou amplía o tamaño do texto na pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Ampliar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar Xirar automaticamente"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Na función Xirar automaticamente baseándose na cara utilízase a cámara frontal para ver se alguén mira a pantalla e como o fai. Pódense realizar lecturas en posición deitada e, ademais, as imaxes nunca se almacenan nin envían a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Máis información&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de mostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O marabilloso mago de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: A marabillosa Cidade Esmeralda de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Buscar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Xirar pantalla automaticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Non"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Si"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activada: baseada na cara"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activar detección facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realzadas"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamento portátil"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ningunha aplicación accedeu recentemente á localización"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da batería elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da batería baixo"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca de wifi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que as aplicacións e os servizos busquen redes wifi en calquera momento, mesmo se a wifi está desactivada. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite ás aplicacións e aos servizos buscar dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servizos de localización para o traballo"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección do fuso horario da localización"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección do fuso horario da localización"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar tamaño do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e texto na pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer pantalla"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermello-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermello-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir brillo"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Reducir o brillo da pantalla por debaixo da intensidade mínima do teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Reducir o brillo da pantalla por debaixo da intensidade mínima da tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Escurece a pantalla para que che resulte máis cómoda a lectura.&lt;br/&gt;&lt;br/&gt; Esta opción de configuración pode serche útil nestas situacións: &lt;ol&gt; &lt;li&gt; O brillo mínimo predeterminado do teléfono é demasiado intenso&lt;/li&gt; &lt;li&gt; Utilizas o teléfono en espazos con pouca luz (por exemplo, pola noite ou nunha estancia ás escuras antes de deitarte)&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tons de chamada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibracións"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificacións"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversas"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Notificacións enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas as dos últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Configuración avanzada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Xeral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificacións do traballo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificacións intelixentes"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificacións intelixentes"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar no panel despregable, na barra de estado e na pantalla de bloqueo"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificacións silenciosas na barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notif. na pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir a pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Tras o desbloqueo facial, vai á última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, bloquear pantalla, omitir, saltar"</string>
@@ -3675,18 +3685,18 @@
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso en modo Non molestar."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
-    <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificacións permitidos"</string>
+    <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificacións permitidas"</string>
     <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificacións en curso importantes"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificacións de conversa"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificación de alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificacións silenciadas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplicacións que non están conectadas en ponte a este axente de escoita"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todas as aplicacións están conectadas en ponte"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplicacións non están conectadas en ponte</item>
+      <item quantity="one">%d aplicación non está conectada en ponte</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplicacións conectadas en ponte"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizos do asistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ningunha aplicación instalada solicitou executarse como servizos do asistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Queres permitir o acceso do servizo de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 restrición</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A maneira na que o operador contabiliza os datos usados pode ser diferente á do dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclúe os datos usados nas redes dos operadores"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclúe os datos usados nas redes dos operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de consumo de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de consumo de datos"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambia o modo de funcionamento da rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión da configuración"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Chamando"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas do operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selección do sistema"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita a SIM e introdúcea de novo. Se o problema persiste, reinicia o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tenta activar a SIM de novo. Se o problema persiste, reinicia o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación da rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operador activo: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para modificar a configuración da SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Cambiouse a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non dispoñibles"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Non está dispoñible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sen SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de rede, Internet, sen fíos, datos, wifi, móbil, operador, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes no modo avión"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Solucionar conectividade"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hai redes dispoñibles no modo avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de rede, desconecta a Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Non se pode cambiar de rede se hai unha conexión establecida"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo avión"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Escribir o número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta o número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir uso de 2G"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 10b5b50..fe71d1d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"અન્ય વપરાશકર્તાઓ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ઉપકરણ સંગ્રહ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"પોર્ટેબલ સંગ્રહ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> માંથી <xliff:g id="USED">%1$s</xliff:g> ઉપયોગમાં લેવાયેલ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> માંથી ઉપયોગમાં લેવાયેલ"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"હાલમાં કોઈ ઍપ દ્વારા સ્થાન ઍક્સેસ કરવામાં આવ્યું નથી"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"વધુ બૅટરી ઉપયોગ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ઓછો બૅટરી ઉપયોગ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"વાઇ-ફાઇ અને બ્લૂટૂથના સ્કૅનિંગનું સેટિંગ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"વાઇ-ફાઇ સ્કૅનિંગ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"જ્યારે વાઇ-ફાઇ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"બ્લૂટૂથ સ્કેનિંગ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ઉપકરણો સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"કાર્ય માટે સ્થાનની સેવાઓ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"સ્થાનના સમય ઝોનની ઓળખ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"સ્થાનના સમય ઝોનની ઓળખ"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"તમે તમારી જરૂરતોના મુજબ આ ડિવાઇસને કસ્ટમાઇઝ કરી શકો છો. સેટિંગમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ફોન્ટનું કદ બદલો"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"સ્ક્રીન રીડર"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"કૅપ્શન"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ઑડિયો"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ડિસ્પ્લે"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ટેક્સ્ટ અને ડિસ્પ્લે"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"સ્ક્રીનને વધુ ઘેરી બનાવો"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"વાદળી-પીળો"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"બ્રાઇટનેસ ઘટાડો"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"સ્ક્રીનને તમારા ફોનની ઓછામાં ઓછી બ્રાઇટનેસ કરતાં વધુ ઘેરી બનાવો"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"સ્ક્રીનને તમારા ટૅબ્લેટની ઓછામાં ઓછી બ્રાઇટનેસ કરતાં વધુ ઘેરી બનાવો"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"તમારી સ્ક્રીનને વધુ ઘેરી બનાવો, જેથી તે વાંચવામાં વધુ આરામદાયક બને.&lt;br/&gt;&lt;br/&gt; આ સહાયરૂપ થઈ શકે છે, જ્યારે: &lt;ol&gt; &lt;li&gt; તમારા ફોનની ડિફૉલ્ટ તરીકે બ્રાઇટનેસ ઓછામાં ઓછી હોવા છતાં ખૂબ જ વધુ બ્રાઇટ દેખાય&lt;/li&gt; &lt;li&gt; તમે તમારા ફોનનો ઉપયોગ અંધારામાં કરી રહ્યાં હો, જેમ કે રાત્રે અથવા સૂતા પહેલાં અંધારીયા રૂમમાં&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"રિંગટોન"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"અન્ય ધ્વનિ અને વાઇબ્રેશન"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"નોટિફિકેશનો"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"વાતચીત"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"તાજેતરમાં મોકલેલ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"છેલ્લા 7 દિવસની બધી ઍપ જુઓ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"વિગતવાર"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"સામાન્ય"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"કાર્યની સૂચનાઓ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"સુવિધાજનક નોટિફિકેશન"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"સુવિધાજનક નોટિફિકેશનને પ્રાથમિકતા"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"નીચે દેખાતા શેડ, સ્ટેટસ બાર અને લૉક સ્ક્રીનમાં બતાવો"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"સ્ટેટસ બારમાં સાઇલન્ટ નોટિફિકેશનને છુપાવો"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"લાઇટ ઝબકવી"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"લૉક સ્ક્રીન પર નોટિફિકેશન"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"પ્રાઇવસી"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"લૉક સ્ક્રીન છોડો"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ફેસ અનલૉક પછી, સીધા જ છેલ્લે ઉપયોગમાં લીધેલી સ્ક્રીન પર જાઓ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"લૉક સ્ક્રીન, લૉક સ્ક્રીન, છોડો, બાયપાસ"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"વાતચીત સંબંધિત નોટિફિકેશન"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"અલર્ટ આપતાં નોટિફિકેશન"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"સાઇલન્ટ નોટિફિકેશન"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"આ લિસનર માટે બ્રિજ નહીં કરેલી ઍપ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"બધી ઍપ બ્રિજ કરેલી છે"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d ઍપને બ્રિજ કરવામાં આવી નથી</item>
+      <item quantity="other">%d ઍપને બ્રિજ કરવામાં આવી નથી</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"બ્રિજ કરેલી ઍપ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR સહાયક સેવાઓ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"કોઇ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ VR સહાયક સેવાઓ તરીકે શરૂ કરવાની વિનંતી કરી નથી."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે VR સેવા ઍક્સેસની મંજૂરી આપીએ?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> પ્રતિબંધ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"કૅરિઅર ડેટા ગણતરી, ડિવાઇસ ગણતરીથી અલગ હોઈ શકે છે"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"મોબાઇલ ઑપરેટરના નેટવર્ક દ્વારા વપરાયેલો ડેટા શામેલ નથી"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"મોબાઇલ ઑપરેટરના નેટવર્ક દ્વારા વપરાયેલો ડેટા શામેલ નથી"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ઉપયોગ થયો"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ડેટા ચેતવણી સેટ કરો"</string>
     <string name="data_warning" msgid="2925054658166062884">"ડેટા ચેતવણી"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"નેટવર્ક ઑપરેટિંગ મોડ બદલો"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"કૅરિઅર"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"સેટિંગનું વર્ઝન"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"કૉલિંગ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"કૅરિઅર વીડિયો કૉલિંગ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"સિસ્ટમ પસંદગી"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"સિમ કાર્ડ ફરીથી ચાલુ કરવાનો પ્રયાસ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"નેટવર્કનું સક્રિયકરણ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"મોબાઇલ ઑપરેટર સ્વિચ કરી રહ્યાં છે"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> સક્રિય છે"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"સિમના સેટિંગ અપડેટ કરવા માટે ટૅપ કરો"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કર્યુ"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ઉપલબ્ધ નથી"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"હંગામી રૂપે અનુપલબ્ધ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"કોઈ સિમ કાર્ડ નથી"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"પસંદગીઓ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"નેટવર્કની પસંદગીઓ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ, સેલ્યુલર, મોબાઇલ, સેલ, મોબાઇલ ઑપરેટર, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"એરપ્લેન મોડ માટે સુરક્ષિત નેટવર્ક જુઓ"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"કનેક્ટિવિટી સુધારો"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"એરપ્લેન મોડમાં નેટવર્ક ઉપલબ્ધ છે"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"બીજા નેટવર્ક પર જવા માટે, ઇથરનેટ ડિસ્કનેક્ટ કરો"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"કનેક્ટેડ હો ત્યારે નેટવર્ક સ્વિચ કરી શકાતા નથી"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"એરપ્લેન મોડના નેટવર્ક"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"કનેક્ટ કરેલું"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ફોન નંબર દાખલ કરો"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ફોન નંબર ખૂટે છે."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ઓકે"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gની મંજૂરી આપો"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a0ae1ab..d4f991f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रीन पर मौजूद टेक्स्ट को छोटा या बड़ा करें."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"छोटा करें"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"बड़ा करें"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"स्क्रीन के अपने-आप घूम जाने की सुविधा का इस्तेमाल करें"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"चेहरे के हिसाब से स्क्रीन के अपने-आप घूम जाने की सुविधा, फ़ोन के सामने वाले कैमरे का इस्तेमाल करके पता लगाती है कि कोई स्क्रीन देख रहा है या नहीं. साथ ही, यह भी पता लगाती है कि स्क्रीन को किस ऐंगल से देखा जा रहा है. इस सुविधा की मदद से, आप लेट कर पढ़ सकते हैं. साथ ही, इसमें न तो इमेज सेव होती हैं और न ही उन्हें Google को भेजा जाता है.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमूना लेख"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ओज़ का अद्भुत जादू"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"अध्याय 11: पन्ने का अद्भुत शहर ओज़"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"सर्च"</string>
     <string name="display_settings" msgid="7197750639709493852">"डिसप्ले"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"स्‍क्रीन अपने-आप घूमने की सुविधा"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"बंद है"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"चालू है"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"चालू है - चेहरे के हिसाब से"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"चेहरा पहचानने की सुविधा चालू करें"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"बिना किसी बदलाव के"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बढ़ाया गया"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"अन्य उपयोगकर्ता"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"डिवाइस मेमोरी"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल संग्रहण"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="USED">%1$s</xliff:g> उपयोग किया गया"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> में से इस्तेमाल की गई"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"किसी भी ऐप्लिकेशन ने हाल ही में जगह की जानकारी का इस्तेमाल नहीं किया"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ज़्यादा बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"कम बैटरी उपयोग"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"वाई-फ़ाई और ब्लूटूथ से स्कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"वाई-फ़ाई स्‍कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ऐप्लिकेशन और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्क स्कैन करने की मंज़ूरी दें, भले ही वाई-फ़ाई बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्‍लूटूथ स्‍कैन करना"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"दफ़्तर के लिए, जगह की जानकारी से जुड़ी सेवाएं."</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"आप इस डिवाइस में अपनी जरूरतों के हिसाब से बदलाव ला सकते हैं. ये सुलभता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फ़ॉन्ट का आकार बदलें"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन रीडर"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडियो और ऑन-स्क्रीन लेख"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"कैप्शन"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ऑडियो"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"डिसप्ले"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"टेक्स्ट और डिसप्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन की चमक को कम करें"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"नीला-पीला रंग पहचान न पाना"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"स्क्रीन की चमक कम करें"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"स्क्रीन की चमक को, अपने फ़ोन की सबसे कम चमक से भी कम करें"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"स्क्रीन की चमक को, अपने टैबलेट की सबसे कम चमक से भी कम करें"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"स्क्रीन की चमक को और कम करें, ताकि इस पर दिखने वाले कॉन्टेंट को ज़्यादा सहजता से पढ़ा जा सके.&lt;br/&gt;&lt;br/&gt; यह तब ज़्यादा मददगार होती है, जब: &lt;ol&gt; &lt;li&gt; आपके फ़ोन की स्क्रीन की चमक डिफ़ॉल्ट तौर पर सबसे कम होने के बावजूद, बहुत ज़्यादा हो&lt;/li&gt; &lt;li&gt; आप फ़ोन को अंधेरे में इस्तेमाल कर रहे हों, जैसे कि रात के समय या सोने से पहले बिना रोशनी वाले कमरे में&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"और आवाज़ें और कंपन (वाइब्रेशन)"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचनाएं"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"बातचीत से जुड़ी सेटिंग"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"हाल ही में सूचनाएं भेजने वाले ऐप्लिकेशन"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"पिछले 7 दिनों में इस्तेमाल किए गए सभी ऐप्लिकेशन देखें"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"बेहतर"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"सामान्य"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"वर्क प्रोफ़ाइल सूचनाएं"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ज़रूरत के हिसाब से सूचनाएं"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ज़रूरत के हिसाब से सूचनाओं को प्राथमिकता देना"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"नीचे खींचने वाली सूची, स्टेटस बार और लॉक स्क्रीन पर दिखाएं"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"आवाज़ और/या वाइब्रेशन के बिना मिलने वाली सूचनाएं, स्टेटस बार में न दिखाएं"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लॉक स्क्रीन पर दिखने वाली सूचनाएं"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"निजता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन छोड़कर आगे बढ़ें"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"चेहरा पहचानकर अनलॉक के बाद, सीधे पिछली खुली स्क्रीन पर जाएं"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, छोड़ें, बायपास"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"बातचीत से जुड़ी सूचनाएं"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"आवाज़ या वाइब्रेशन वाली सूचनाएं"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"बिना आवाज़ या वाइब्रेशन वाली सूचनाएं"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"इस उपयोगकर्ता को इन ऐप्लिकेशन की सूचनाएं नहीं दिखेंगी"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"सभी ऐप्लिकेशन की सूचनाएं उपयोगकर्ता को दिखेंगी"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">उपोयगकर्ता को %d ऐप्लिकेशन की सूचनाएं नहीं दिखेंगी</item>
+      <item quantity="other">उपोयगकर्ता को %d ऐप्लिकेशन की सूचनाएं नहीं दिखेंगी</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ऐप्लिकेशन जिनकी सूचनाएं उपोयगकर्ता को दिखेंगी"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR सहायक सेवाएं"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के तौर पर चलाए जाने के लिए अनुरोध नहीं किया है."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के इस्तेमाल की अनुमति दें?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> प्रतिबंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के बजाय किसी दूसरी कंपनी का इस्तेमाल किया गया डेटा"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के बजाय किसी दूसरी कंपनी का इस्तेमाल किया गया डेटा"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावनी सेट करें"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावनी"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क संचालन मोड बदलें"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"पसंदीदा नेटवर्क प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिंग वर्शन"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"कॉल करना"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की वीडियो कॉलिंग सुविधा"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"सिस्टम चुनें"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम निकालकर फिर से लगाएं. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम दोबारा चालू करने की कोशिश करें. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क चालू करना"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी बदली जा रही है"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू है"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिम की सेटिंग अपडेट करने के लिए टैप करें"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"अब <xliff:g id="CARRIER_NAME">%1$s</xliff:g> का इस्तेमाल किया जा रहा है"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नहीं है"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"फ़िलहाल, उपलब्ध नहीं है"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"कोई सिम कार्ड नहीं लगाया गया है"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताएं"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क की सेटिंग"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्क से कनेक्ट करें"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाईफ़ाई, सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"हवाई जहाज़ मोड वाले नेटवर्क देखें"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिविटी से जुड़ी समस्याएं ठीक करें"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाई जहाज़ मोड पर काम करने वाले नेटवर्क उपलब्ध हैं"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"हवाई जहाज़ मोड नेटवर्क"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट हो गया"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फ़ोन नंबर डालें"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फ़ोन नंबर नहीं डाला गया."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठीक है"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G के इस्तेमाल की मंज़ूरी दें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 52b40b6..a6fbbf4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Smanjite ili povećajte tekst na zaslonu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Smanji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Povećaj"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Upotreba automatskog zakretanja"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatsko zakretanje na temelju lica koristi se prednjom kamerom da bi saznalo gleda li netko zaslon i kako ga gleda. Omogućuje čitanje u ležećem položaju, a slike se nikad ne pohranjuju niti se šalju Googleu.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Primjer teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. poglavlje: Čudesni Smaragdni Grad čarobnjaka Oza"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraži"</string>
     <string name="display_settings" msgid="7197750639709493852">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatski zakreni zaslon"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na temelju lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogući prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodno"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačano"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Pohrana na uređaju"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prijenosna pohrana"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Iskorišteno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije pristupila lokaciji u posljednje vrijeme"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niska potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Traženje Wi‑Fija i Bluetootha"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Traženje Wi‑Fi-ja"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dopustite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Traženje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ovaj uređaj možete prilagoditi svojim potrebama. Značajke pristupačnosti možete promijeniti kasnije u postavkama."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promijenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači zaslona"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na zaslonu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titlovi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audiozapis"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjenje zaslona"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo – žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjenje svjetline"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Zatamnite zaslon više od minimalne zadane svjetline svojeg telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Zatamnite zaslon više od minimalne zadane svjetline svojeg tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Zatamnite zaslon kako vam ne bi blještao u oči dok čitate.&lt;br/&gt;&lt;br/&gt; To može biti korisno u sljedećim situacijama: &lt;ol&gt; &lt;li&gt; Zadana minimalna svjetlina na telefonu i dalje je presvijetla.&lt;/li&gt; &lt;li&gt; Koristite telefon u mraku, na primjer noću ili u tamnoj sobi prije spavanja.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ostali zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obavijesti"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Razgovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve u posljednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Dodatne postavke"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opće"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obavijesti s radnog profila"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljive obavijesti"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljiv prioritet obavijesti"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na zaslonu obavijesti, traci statusa i zaključanom zaslonu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij tihe obavijesti na traci statusa"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepereće svjetlo"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obavijesti na zaklj. zaslonu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključan zaslon"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nakon otključavanja licem otvori posljednji korišteni zaslon"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Zaključan zaslon, preskakanje, zaobilaženje"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Obavijesti o razgovorima"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučne obavijesti"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Bešumne obavijesti"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacije koje nisu premošćene za ovog slušatelja"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Sve su aplikacije premošćene"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d aplikacija nije premošćena</item>
+      <item quantity="few">%d aplikacije nisu premošćene</item>
+      <item quantity="other">%d aplikacija nije premošćeno</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Premošćene aplikacije"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomoćne usluge za virtualnu stvarnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila da se pokrene kao pomoćna usluga za virtualnu stvarnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li dopustiti pristup usluge virtualne stvarnosti za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Izuzima podatke koje koriste mreže mobilnog operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Izuzima podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozorenje o potrošnji"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o potrošnji"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Željena vrsta mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Dostavljač"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija postavki"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videopozivanje putem mobilnog operatera"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Odabir sustava"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM i umetnite ga ponovo. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Promjena mobilnog operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali postavke SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prešli ste na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nije dostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilno, mobilni uređaj, mobilni operater, 4 g, 3 g, 2 g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Pregled mreža sigurnih za rad u zrakopl."</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Rješavanje problema s povezivošću"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u zrakoplovu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste se prebacili na drugu mrežu, odspojite ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete promijeniti mrežu dok ste povezani"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u načinu rada u zrakoplovu"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite telefonski broj"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nedostaje telefonski broj."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"U redu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dopusti 2G"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fcfe9c5..c630e58 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Kicsinyítheti vagy nagyíthatja a képernyőn megjelenő szöveget."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kisebb"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Nagyobb"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automatikus forgatás használata"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Az arcalapú automatikus forgatás az előlapi kamerát használja annak ellenőrzésére, hogy nézi-e felhasználó a képernyőt, és ha igen, miképpen teszi. A funkció segítségével fekvés közben is működik az arcfelismerés. A rendszer a képeket nem tárolja vagy küldi tovább a Google-nak.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;További információ.&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Mintaszöveg"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Óz, a csodák csodája"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. fejezet: A csodálatos Smaragdváros"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Keresés"</string>
     <string name="display_settings" msgid="7197750639709493852">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatikus képernyőforgatás"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Ki"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Be"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Be: Arcalapú"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Arcfelismerés bekapcsolása"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Színek"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Természetes"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Élénk"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Egyéb felhasználók"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Eszköz tárhelye"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hordozható tárhely"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="USED">%1$s</xliff:g> foglalt"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g> foglalt"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Egy alkalmazás sem fért hozzá a helyadatokhoz a közelmúltban"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Magas akkumulátorhasználat"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Alacsony akkumulátorhasználat"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi- és Bluetooth-alapú keresés"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-keresés"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy Wi-Fi-hálózatokat keressenek még akkor is, ha ki van kapcsolva a Wi-Fi. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-alapú keresés"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy közeli eszközöket keressenek még akkor is, ha ki van kapcsolva a Bluetooth. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Munkahelyi helyszolgáltatások"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Helyalapú időzóna-meghatározás"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Helyalapú időzóna-meghatározás"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Eszközét saját igényeinek megfelelően testre szabhatja. Ezeket a kisegítő lehetőségeket később a Beállítások menüben módosíthatja."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Betűméret módosítása"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Képernyőolvasók"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hang és képernyőn megjelenő szöveg"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Feliratok"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Hang"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Megjelenítés"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Szöveg és megjelenítés"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Képernyő sötétítése"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vörös-zöld"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vörös-zöld"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Kék-sárga"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Fényerő csökkentése"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"A képernyő sötétítése a telefon minimális fényerejénél sötétebbre"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"A képernyő sötétítése a táblagép minimális fényerejénél sötétebbre"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Sötétítéssel könnyebben olvasható a képernyő.&lt;br/&gt;&lt;br/&gt; Ez például a következő esetekben lehet hasznos: &lt;ol&gt; &lt;li&gt; Ha a telefon alapértelmezett minimális fényereje még mindig túl nagy.&lt;/li&gt; &lt;li&gt; Ha a telefont sötét körülmények között használja (például éjjel vagy sötét szobában lefekvés előtt).&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Csengőhangok"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Egyéb hangok és rezgések"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Értesítések"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Beszélgetés"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nemrég küldött"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Az összes megtekintése az utolsó hét napból"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Speciális"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Általános"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Munkahelyi profil értesítései"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Alkalmazkodó értesítések"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptív értesítés prioritása"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Megjelenítés a lehúzható értesítések között, az állapotsoron és a lezárási képernyőn"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Az állapotsor néma értesítéseinek elrejtése"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Villogó fény"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Értesítések a lezárási képernyőn"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Adatvédelem"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lezárási képernyő kihagyása"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Arcalapú feloldás után a legutóbbi képernyő megnyitása"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lezárási képernyő, Kihagyás, Megkerülés"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Beszélgetésre vonatkozó értesítések"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Figyelemfelkeltő értesítések"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Néma értesítések"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Alkalmazások, amelyek nincsenek híd módban a hallgató számára"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Minden alkalmazás híd módban van"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d alkalmazás nincs híd módban</item>
+      <item quantity="one">%d alkalmazás nincs híd módban</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Alkalmazások híd módban"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Virtuálisvalóság-segédszolgáltatás"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Egy telepített alkalmazás sem kérte, hogy virtuálisvalóság-segédszolgáltatásként legyen futtatva."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> számára a hozzáférést a virtuálisvalóság-szolgáltatáshoz?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 korlátozás</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A szolgáltató adatszámlálási módja eltérhet az eszközétől"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Nem tartalmazza a szolgáltatói hálózatokon használt adatforgalmat"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Nem tartalmazza a szolgáltatói hálózatokon használt adatforgalmat"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Forgalmi figyelmeztetés beáll."</string>
     <string name="data_warning" msgid="2925054658166062884">"Adatforgalmi figyelmeztetés"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"A hálózati üzemmód megváltoztatása"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Előnyben részesített hálózattípus"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Szolgáltató"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Beállítások verziója"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Hívás"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Szolgáltatói videohívás"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Rendszer kiválasztása"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Távolítsa el a SIM-kártyát, majd helyezze be újra. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Próbálkozzon meg újra a SIM bekapcsolásával. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Hálózat aktiválása"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Szolgáltatóváltás"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: aktív"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Koppintson a SIM-beállítások frissítéséhez."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Átváltva erre: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nem áll rendelkezésre"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Átmenetileg nem áll rendelkezésre"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kártya nélkül"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Beállítások"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Hálózati beállítások"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Csatlakozás nyilvános hálózatokhoz"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"hálózati kapcsolat, internet, vezeték nélküli, mobiladat, adat, wifi, wi-fi, mobil, mobiltelefon, szolgáltató, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Repülőn használható hálózatok mutatása"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Csatlakozás javítása"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hozzáférhetők repülős üzemmódban használható hálózatok"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Hálózatváltáshoz válassza le az ethernetet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Csatlakozott állapotban nem lehet hálózatot váltani"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Repülős üzemmód hálózatok"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> (<xliff:g id="NETWORKMODE">%2$s</xliff:g>)"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Csatlakozva"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonszám megadása"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Hiányzik a telefonszám."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G engedélyezése"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4034935..066c9d6 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Փոփոխեք տեքստի չափը։"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Փոքրացնել"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Մեծացնել"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Օգտագործել ինքնապտտումը"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Դիմաճանաչման հիման վրա ինքնապտտման ռեժիմում սարքն օգտագործում է առջևի տեսախցիկը, որպեսզի հետևի՝ արդյոք ինչ-որ մեկը նայում է էկրանին և ինչպես է նայում։ Այս գործառույթը թույլ է տալիս կարդալ պառկած դիրքում, և պատկերները երբեք չեն պահվում և չեն ուղարկվում Google-ին։&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Իմանալ ավելին&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Տեքստի նմուշ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Օզի կախարդը"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Գլուխ 11. Օզի հրաշալի Զմրուխտե քաղաքը"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Որոնել"</string>
     <string name="display_settings" msgid="7197750639709493852">"Էկրան"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Ավտոմատ պտտել էկրանը"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Անջատել"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Միացնել"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Միաց․ – Դիմաճանաչման հիման վրա"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Միացնել դիմաճանաչումը"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Գույներ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Բնական"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Պայծառ"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Այլ օգտատերեր"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Սարքի հիշողություն"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Դյուրակիր հիշողություն"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Օգտագործվել է <xliff:g id="USED">%1$s</xliff:g>՝ <xliff:g id="TOTAL">%2$s</xliff:g>-ից"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ոչ մի հավելված չի օգտագործել տեղադրությունը"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Մարտկոցի շատ օգտագործում"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Մարտկոցի ցածր սպառում"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi ցանցերի և Bluetooth ազդանշանի որոնում"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi ցանցերի որոնում"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Թույլ տալ հավելվածներին և ծառայություններին որոնել Wi‑Fi ցանցեր, նույնիսկ երբ Wi-Fi-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը։"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth սարքերի որոնում"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Թույլ տալ հավելվածներին և ծառայություններին որոնել մոտակայքում գտնվող սարքեր նույնիսկ երբ Bluetooth-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը:"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Տեղորոշման ծառայություններ աշխատանքի համար"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Փոխեք տառաչափը"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Էկրանի ընթերցիչներ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Աուդիո և էկրանի տեքստ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Ենթագրեր"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Աուդիո"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Էկրան"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Տեքստ և էկրան"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Էկրանի մգացում"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Կապույտ-դեղին"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Նվազեցնել պայծառությունը"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ավելի մգացրեք հեռախոսի էկրանը, քան նվազագույն պայծառության դեպքում"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ավելի մգացրեք պլանշետի էկրանը, քան նվազագույն պայծառության դեպքում"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ավելի մգացրեք էկրանը՝ հարմար կարդալու համար։&lt;br/&gt;&lt;br/&gt; Դա կարող է օգնել, երբ. &lt;ol&gt; &lt;li&gt; Նվազագույն պայծառության ժամանակ հեռախոսի էկրանը դեռ շատ պայծառ է։t&lt;/li&gt; &lt;li&gt; Դուք օգտագործում եք հեռախոսը մթության մեջ, օրինակ, գիշերը կամ մութ սենյակում՝ քնելուց առաջ։&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Զանգերանգներ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Այլ ձայներ և թրթռոցներ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ծանուցումներ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Զրույց"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Վերջերս ուղարկված"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ցուցադրել վերջին 7 օրվա բոլոր հավելվածները"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Լրացուցիչ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ընդհանուր"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Աշխատանքային ծանուցումներ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Հարմարվող ծանուցումներ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Հարմարվող ծանուցումների առաջնահերթություն"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ցուցադրել իջնող վահանակի վրա, կարգավիճակի գոտում և կողպէկրանին"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Թաքցնել անձայն ծանուցումները կարգավիճակի գոտում"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Թարթող լույս"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ծանուցումներ կողպէկրանին"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Գաղտնիություն"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Բաց թողնել կողպէկրանը"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Դեմքով ապակողպելուց հետո անցնել վերջին օգտագործած էկրանին"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Էկրանի կողպում, կողպէկրան, բաց թողնել, շրջանցել"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Զրույցների ծանուցումներ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Նախազգուշացնող ծանուցումներ"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Անձայն ծանուցումներ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Հավելվածներ, որոնք միացված չեն այս ունկնդրին"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Բոլոր հավելվածները միացված են"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d հավելված միացված չէ</item>
+      <item quantity="other">%d հավելված միացված չէ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Միացված հավելվածներ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR օգնության ծառայություններ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Տեղադրված հավելվածներից ոչ մեկը որպես VR օգնության ծառայություն գործարկվելու հարցում չի ուղարկել:"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Թույլատրե՞լ VR ծառայությանն օգտագործել <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Չեն հետագծվում այն ցանցերի տվյալները, որոնք սպասարկվում են օպերատորների կողմից"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Օպերատորների կողմից սպասարկվող ցանցերի տվյալները չեն հետագծվում"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Նախազգուշացում դնել"</string>
     <string name="data_warning" msgid="2925054658166062884">"Նախազգուշացում"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ցանցի աշխատանքի ռեժիմի փոփոխություն"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ցանցի նախընտրելի տեսակը"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Օպերատոր"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Կարգավորումների տարբերակ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Զանգ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Տեսազանգեր բջջային ցանցի միջոցով"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Համակարգի ընտրությում"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Հանեք, այնուհետև նորից տեղադրեք SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Փորձեք նորից միացնել SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ցանցի ակտիվացում"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Անցում այլ օպերատորի"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ցանցն ակտիվ է"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Հպեք՝ SIM քարտի կարգավորումները թարմացնելու համար"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Միացել է <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ի ցանցին"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"անհասանելի է"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ժամանակավորապես անհասանելի է"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM քարտ չկա"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Կարգավորումներ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ցանցի կարգավորումներ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Միանալ հանրային ցանցերին"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"կապ, համացանց, անլար, ինտերնետ, wifi, wi-fi, wi fi, բջջային, շարժական, բջջային օպերատոր, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Շտկել կապի խնդիրը"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ավիառեժիմում հասանելի ցանցեր"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Այլ ցանցի անցնելու համար անջատեք Ethernet-ը"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Հնարավոր չէ անցնել այլ ցանցի, երբ կապ է հաստատված"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Միացած է"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Մուտքագրեք հեռախոսահամար"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Հեռախոսահամարը նշված չէ։"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Եղավ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ցանցը միացնելու թույլտվություն"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 632fbb6..9e932e4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Buat teks di layar jadi lebih kecil atau lebih besar."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Buat lebih kecil"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Buat lebih besar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gunakan Putar Otomatis"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Putar Otomatis berbasis deteksi wajah menggunakan kamera depan untuk melihat apakah dan bagaimana seseorang melihat ke layar. Fitur ini memungkinkan Anda membaca sambil berbaring dan gambar tidak akan disimpan atau dikirim ke Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Pelajari lebih lanjut&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teks contoh"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Penyihir Oz yang Menakjubkan"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Bab 11: Oz, Kota Zamrud yang Menakjubkan"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Telusuri"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotasi layar otomatis"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Nonaktif"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktif"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktif - Berbasis deteksi wajah"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktifkan Deteksi Wajah"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Alami"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ditingkatkan"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Pengguna lainnya"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Penyimpanan perangkat"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Penyimpanan portabel"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Terpakai <xliff:g id="USED">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Terpakai dari <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Tidak ada aplikasi yang baru-baru ini mengakses lokasi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Penggunaan baterai tinggi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Penggunaan baterai rendah"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pemindaian Wi‑Fi dan Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pemindaian Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Izinkan aplikasi dan layanan untuk memindai jaringan Wi-Fi kapan saja, meski Wi-Fi nonaktif. Ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pemindaian Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Izinkan aplikasi dan layanan untuk memindai perangkat di sekitar kapan saja, meski Bluetooth nonaktif. Ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Layanan lokasi untuk profil kerja"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteksi zona waktu lokasi"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteksi zona waktu lokasi"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Anda dapat menyesuaikan perangkat ini sesuai kebutuhan. Fitur aksesibilitas ini dapat diubah nanti di Setelan."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ubah ukuran font"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca layar"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks di layar"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Teks"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Tampilan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks dan tampilan"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Buat layar lebih gelap"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-kuning"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Kurangi Kecerahan"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Membuat layar lebih gelap daripada kecerahan minimum ponsel"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Membuat layar lebih gelap daripada kecerahan minimum tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Buat layar lebih gelap agar Anda lebih nyaman membaca.&lt;br/&gt;&lt;br/&gt; Ini berguna saat: &lt;ol&gt; &lt;li&gt; Kecerahan minimum default ponsel masih terlalu cerah&lt;/li&gt; &lt;li&gt; Anda menggunakan ponsel di lingkungan yang gelap, seperti saat malam hari atau di kamar yang gelap sebelum tidur&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Suara dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifikasi"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Percakapan"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Dikirim baru-baru ini"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Lihat semua dari 7 hari terakhir"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Lanjutan"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umum"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifikasi kerja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifikasi adaptif"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritas notifikasi adaptif"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ditampilkan di bayangan pull-down, status bar &amp; di layar kunci"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sembunyikan notifikasi senyap di status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cahaya kedip"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifikasi di layar kunci"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privasi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lewati layar kunci"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Setelah Face Unlock, langsung buka layar yang terakhir digunakan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Layar kunci, Layar kunci, Lewati, Abaikan"</string>
@@ -3676,17 +3686,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Nonaktifkan"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Batalkan"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Jenis notifikasi yang diizinkan"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifikasi penting yang sedang berlangsung"</string>
+    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifikasi persisten yang penting"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notifikasi percakapan"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notifikasi bersuara"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notifikasi senyap"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikasi yang tidak dihubungkan ke pemroses ini"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Semua aplikasi telah dihubungkan"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplikasi tidak dihubungkan</item>
+      <item quantity="one">%d aplikasi tidak dihubungkan</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplikasi yang terhubung"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Layanan bantuan VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tidak ada aplikasi terinstall yang meminta dijalankan sebagai layanan bantuan VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Izinkan akses layanan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 pembatasan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Perhitungan data oleh operator dapat berbeda dengan perhitungan perangkat"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mengecualikan data yang digunakan oleh jaringan operator"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Mengecualikan data yang digunakan oleh jaringan operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setel peringatan penggunaan data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Peringatan penggunaan data"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ubah mode pengoperasian jaringan"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Jenis jaringan pilihan"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versi setelan"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Memanggil"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Panggilan video operator"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pilih sistem"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM, lalu masukkan lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Coba aktifkan SIM lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivasi jaringan"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Beralih operator"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketuk untuk memperbarui setelan SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Dialihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia untuk sementara"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tidak ada SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferensi"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferensi jaringan"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Hubungkan ke jaringan publik"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksi jaringan, internet, nirkabel, data, wifi, wi-fi, wi fi, seluler, (perangkat) seluler, operator seluler, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tampilkan jaringan mode pesawat"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Perbaiki konektivitas"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Jaringan dalam mode pesawat tersedia"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk beralih jaringan, lepaskan kabel ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak dapat beralih jaringan saat terhubung"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Jaringan dalam mode pesawat"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Terhubung"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan Nomor telepon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tidak ada nomor telepon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Oke"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Izinkan 2G"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index be7fa58..7d1e716 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Stækkaðu eða minnkaðu texta á skjá."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Minnka"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Stækka"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Nota sjálfvirkan snúning"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Sjálfvirkur snúningur út frá andliti notar fremri myndavélina til að sjá hvort og hvernig einhver horfir á skjáinn Með þessum eiginleika er hægt að lesa liggjandi og myndir eru hvorki geymdar né sendar til Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Frekari upplýsingar&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Textadæmi"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Galdrakarlinn í Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. kafli: Smaragðsborgin dásamlega í Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Leit"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skjár"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Snúa skjá sjálfkrafa"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Slökkt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Kveikt"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Kveikt – út frá andliti"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Kveikja á andlitsgreiningu"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Litir"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Náttúrulegir"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Efldir"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Aðrir notendur"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Geymsla tækis"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Færanleg geymsla"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> notuð af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Notuð af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Engin forrit hafa nýlega haft aðgang að staðsetningu"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mikil rafhlöðunotkun"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lítil rafhlöðunotkun"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi leit og Bluetooth-leit"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi leit"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Leyfa forritum og þjónustu að leita að Wi-Fi netum hvenær sem er, jafnvel þegar slökkt er á Wi-Fi. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-leit"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leyfa forritum og þjónustu að leita að nálægum tækjum hvenær sem er, jafnvel þegar slökkt er á Bluetooth. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Staðsetningarþjónustur fyrir vinnuna"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Staðsetningargreining tímabeltis"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Staðsetningargreining tímabeltis"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Breyta leturstærð"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjálesarar"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hljóð og skjátexti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Skjátextar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Hljóð"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Skjár"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texti og birting"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Dekkja skjáinn"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rauðgræn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rauðgræn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blágul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Draga úr birtu"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gera skjáinn dekkri en lágmarksbirtustillingu símans"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gera skjáinn dekkri en lágmarksbirtustillingu spjaldtölvunnar"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gerðu skjáinn dekkri svo það sé þægilegra að lesa.&lt;br/&gt;&lt;br/&gt; Þetta getur gagnast þegar: &lt;ol&gt; &lt;li&gt; Sjálfgefin lágmarksbirta símans er of mikil&lt;/li&gt; &lt;li&gt; Þú notar símann í myrkri, t.d. á nóttunni eða í dimmu herbergi áður en þú ferð að sofa&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Hringitónar"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Önnur hljóð og titringur"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Tilkynningar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtal"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Sent nýlega"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Sjá allt frá síðustu 7 dögum"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Ítarlegt"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Almennt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Vinnutilkynningar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Breytilegar tilkynningar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Breytilegur forgangur tilkynninga"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Birta á fellisvæði, stöðustiku og lásskjá"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fela þöglar tilkynningar á stöðustiku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikkandi ljós"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Tilkynningar á lásskjá"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Persónuvernd"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sleppa lásskjá"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Eftir andlitsopnun ferðu beint á síðasta skjá"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Læsa skjá, lásskjár, sleppa, sneiða hjá"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalstilkynningar"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Viðvörunartilkynningar"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Þöglar tilkynningar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Forrit sem eru ekki brúuð við þennan hlustanda"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Öll forrit brúuð"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d forrit óbrúað</item>
+      <item quantity="other">%d forrit óbrúuð</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Brúuð forrit"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjálparþjónusta sýndarveruleika"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Engin uppsett forrit hafa óskað eftir að vera keyrð sem sýndarveruleikaþjónusta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leyfa sýndarveruleikaaðgang fyrir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> takmarkanir</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Gögn símafyrirtækisins kunna að vera önnur en tækið sýnir"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Tekur ekki með gögn sem eru notuð af netkerfum símafyrirtækja"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Tekur ekki með gögn sem eru notuð af netkerfum símafyrirtækja"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> notuð"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stilla gagnaviðvörun"</string>
     <string name="data_warning" msgid="2925054658166062884">"Gagnaviðvörun"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Breyta virknihætti símkerfis"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Valin símkerfistegund"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Símafyrirtæki"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Stillingaútgáfa"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Hringir"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Myndsímtöl um símkerfi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Kerfisval"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjarlægðu SIM-kortið og settu það inn aftur. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prófaðu að kveikja aftur á SIM-kortinu. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Virkjun símkerfis"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Skipt um símafyrirtæki"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er virkt"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ýttu til að uppfæra stillingar SIM-korts"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Skipt yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ekki tiltækt"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ekki tiltækt í augnablikinu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ekkert SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Kjörstillingar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netstillingar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Tengjast opnum netum"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettenging, internetið, þráðlaust, gögn, wifi, wi-fi, wi fi, farsímakerfi, farsími, símafyrirtæki, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Skoða örugg netkerfi fyrir flugstillingu"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Laga tengigetu"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Net fyrir flugstillingu í boði"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aftengdu ethernet til að skipta um net"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ekki er hægt að skipta um net á meðan tenging er virk"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugnet"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tengt"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Slá inn símanúmer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Símanúmer vantar."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Í lagi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Leyfa 2G"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c338f20..c90c7a3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ingrandisci o riduci il testo sullo schermo."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Rimpicciolisci"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Ingrandisci"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usa la rotazione automatica"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"La funzionalità di rotazione automatica basata sul viso usa la fotocamera anteriore per controllare se e come qualcuno sta guardando lo schermo. Consente di leggere stando sdraiati e le immagini non vengono mai memorizzate su Google o inviate a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Scopri di più&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Testo di esempio"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Il meraviglioso mago di Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capitolo 11: La splendida Città di smeraldo di Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Ricerca"</string>
     <string name="display_settings" msgid="7197750639709493852">"Display"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotazione automatica"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Off"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"On"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"On - Rotazione basata sul viso"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Attiva riconoscimento facciale"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturali"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Migliorati"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Altri utenti"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Memoria dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Memoria portatile"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usati di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"utilizzati di <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nessuna app ha effettuato di recente l\'accesso alla posizone"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Elevato utilizzo della batteria"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Basso utilizzo della batteria"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Scansione Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Ricerca di reti Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Consenti ad app e servizi di cercare reti Wi-Fi in qualsiasi momento, anche quando il Wi-Fi non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Scansione di dispositivi Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Rilevamento del fuso orario in base alla posizione"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Rilevamento del fuso orario in base alla posizione"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambia dimensioni carattere"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen reader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e testo su schermo"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sottotitoli"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Testo e display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scurisci lo schermo"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rosso-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rosso-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blu-giallo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Riduci la luminosità"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Rendi lo schermo più scuro della luminosità minima del telefono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Rendi lo schermo più scuro della luminosità minima del tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Scurisci lo schermo per facilitare la lettura.&lt;br/&gt;&lt;br/&gt; Può essere utile quando: &lt;ol&gt; &lt;li&gt; La luminosità minima predefinita del telefono è ancora troppo chiara.&lt;/li&gt; &lt;li&gt; Usi il telefono al buio, ad esempio di notte o in una stanza buia prima di andare a letto.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Suonerie"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Altri suoni e vibrazioni"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifiche"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversazione"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Inviate di recente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra tutte le app degli ultimi 7 giorni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzate"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generali"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifiche di lavoro"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifiche adattive"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorità per le notifiche adattive"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Verranno visualizzate nell\'area a discesa, nella barra di stato e nella schermata di blocco"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Nascondi le notifiche silenziose nella barra di stato"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luce lampeggiante"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifiche su schermata di blocco"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignora schermata di blocco"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Dopo lo sblocco con il volto, vai all\'ultima schermata usata"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Schermata di blocco, Schermata blocco, Salta, Ignora"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notifiche delle conversazioni"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notifiche di avviso"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notifiche silenziose"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"App non collegate a questo listener"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Tutte le app sono collegate"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d app non collegate</item>
+      <item quantity="one">%d app non collegata</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"App collegate"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizi helper VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nessuna delle app installate ha richiesto di essere eseguita come servizio helper VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Consentire l\'accesso a <xliff:g id="SERVICE">%1$s</xliff:g> al servizio VR?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 restrizione</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"I dati dell\'operatore potrebbero differire da quelli del dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vengono esclusi i dati usati dalle reti dell\'operatore"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vengono esclusi i dati usati dalle reti dell\'operatore"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dati utilizzati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Imposta avviso sui dati"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avviso sui dati"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambia la modalità di funzionamento della rete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo di rete preferito"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatore"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versione impostazioni"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Chiamata"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochiamata dell\'operatore"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selezione sistema"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Rimuovi la SIM e inseriscila di nuovo. Se il problema persiste, riavvia il dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Riprova ad attivare la SIM. Se il problema persiste, riavvia il dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Attivazione della rete"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio di operatore in corso…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"L\'operatore <xliff:g id="CARRIER_NAME">%1$s</xliff:g> è attivo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tocca per aggiornare le impostazioni della SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Passaggio a <xliff:g id="CARRIER_NAME">%1$s</xliff:g> effettuato"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"Non disponibili"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentaneamente non disponibile"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nessuna SIM rilevata"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferenze"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferenze di rete"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connetti a reti pubbliche"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connessione rete, internet, wireless, dati, wifi, wi-fi, wi fi, cellulare, dispositivo mobile, operatore cellulare, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visualizza reti con modalità aereo"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Risolvi problema di connettività"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Reti con modalità aereo disponibili"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per cambiare rete, scollega il cavo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossibile cambiare rete con la connessione attiva"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Reti con modalità aereo"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connessione attiva"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserisci numero di telefono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manca il numero di telefono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Consenti 2G"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b99f446..25c66b5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"שינוי גודל הטקסט שמופיע במסך."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"הקטנה"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"הגדלה"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"שימוש בסיבוב אוטומטית"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"‏במסגרת סיבוב אוטומטי המבוסס על זיהוי פנים, המצלמה הקדמית משמשת את המכשיר כדי לבדוק אם מישהו מביט במסך. כך אפשר לקרוא בשכיבה, והתמונות לעולם לא נשמרות ב-Google או נשלחות אליה.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;למידע נוסף&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"טקסט לדוגמה"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"הקוסם המופלא מארץ עוץ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"פרק 11: עיר הברקת המופלאה של ארץ עוץ"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"חיפוש"</string>
     <string name="display_settings" msgid="7197750639709493852">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"סיבוב אוטומטי של המסך"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"כבוי"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"פועל"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"פועל – מבוסס על זיהוי פנים"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"הפעלת זיהוי פנים"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"צבעים"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"טבעי"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"מוגבר"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"משתמשים אחרים"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"אחסון במכשיר"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"אחסון נייד"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"נעשה שימוש ב-<xliff:g id="USED">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"בשימוש מתוך <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"אין אפליקציות שניגשו לאחרונה למיקום"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"שימוש בסוללה מלאה"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"שימוש בסוללה חלשה"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏חיפוש נקודות Wi‑Fi ו-Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏חיפוש נקודות Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏אפליקציות ושירותים יוכלו לסרוק רשתות Wi‑Fi בכל עת, גם כאשר ה-Wi‑Fi כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‏סריקת Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‏אפליקציות ושירותים יוכלו לסרוק מכשירים בקרבת מקום בכל עת, גם כאשר ה-Bluetooth כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"שירותי מיקום לעבודה"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"זיהוי אזור הזמן של המיקום"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"זיהוי אזור הזמן של המיקום"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"שינוי גודל הגופן"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"קוראי מסך"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"הקראת טקסט שמופיע במסך"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"כתוביות"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"אודיו"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"תצוגה"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"טקסט ותצוגה"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"הכהיית המסך"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"אדום-ירוק"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"אדום-ירוק"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"כחול-צהוב"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"הפחתה של עוצמת הבהירות"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"הפיכת המסך לכהה יותר מעוצמת הבהירות המינימלית של הטלפון"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"הפיכת המסך לכהה יותר מעוצמת הבהירות המינימלית של הטאבלט"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏מסך כהה יותר מקל על הקריאה.&lt;br/&gt;&lt;br/&gt; הגדרה זו עשויה להיות שימושית במקרים הבאים: &lt;ol&gt; &lt;li&gt; כשעוצמת הבהירות המינימלית של הטלפון עדיין בהירה מדי&lt;/li&gt; &lt;li&gt; כשמשתמשים בטלפון במצבים כהים, למשל בלילה או בחדר חשוך לפני השינה&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"רינגטונים"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"צלילים אחרים ורטט"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"התראות"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"שיחה"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"נשלחו לאחרונה"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"הצגת כל האפליקציות מ-7 הימים האחרונים"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"אפשרויות מתקדמות"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"כללי"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"התראות עבודה"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"התראות מותאמות"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"עדיפות מותאמת להתראות"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"מוצגות בלוח ההתראות הנפתח, בשורת הסטטוס ובמסך הנעילה"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"הסתרה של התראות שקטות בשורת הסטטוס"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"אור מהבהב"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"התראות במסך הנעילה"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"פרטיות"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"דילוג על מסך הנעילה"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"מעבר למסך האחרון שהיה בשימוש לאחר שחרור נעילה בזיהוי פנים"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"מסך נעילה, דילוג, מעקף"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"התראות על שיחות"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"התראות עם צלילים או רטט"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"התראות שקטות"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"‏אפליקציות שאינן מקושרות ל-listener הזה"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"כל האפליקציות מקושרות"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="two">‏%d אפליקציות לא מקושרות</item>
+      <item quantity="many">‏%d אפליקציות לא מקושרות</item>
+      <item quantity="other">‏%d אפליקציות לא מקושרות</item>
+      <item quantity="one">אפליקציה אחת לא מקושרת</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"אפליקציות מקושרות"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏שירותי מסייע של VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏אין אפליקציות מותקנות שביקשו הפעלה כשירותי מסייע של VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏האם לאפשר לשירות VR גישה אל <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="one">הגבלה אחת</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"לא כולל נתונים שמשמשים את רשתות הספק"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"לא כולל נתונים שמשמשים את רשתות הספק"</string>
     <string name="data_used_template" msgid="8229342096562327646">"נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"מתי תופיע אזהרת שימוש בנתונים"</string>
     <string name="data_warning" msgid="2925054658166062884">"אזהרה לגבי שימוש בנתונים"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"שינוי מצב ההפעלה של הרשת"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"סוג רשת מועדפת"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ספק"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"גרסת הגדרות"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"שיחות"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"שיחות וידאו באמצעות הספק הסלולרי"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"בחירת מערכת"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏יש להוציא את ה-SIM ולהכניס אותו חזרה. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏יש להפעיל שוב את ה-SIM. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"הפעלת רשת"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"החלפת ספק"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> פעיל"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏יש להקיש כדי לעדכן את ההגדרות של כרטיס ה-SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"עברת אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"לא זמין"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"לא זמין באופן זמני"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏אין כרטיס SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"העדפות"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"העדפות רשת"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"חיבור לרשתות ציבוריות"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏חיבור לרשת, אינטרנט, אלחוטי, נתונים, Wi-Fi, wi-fi, wi fi, סלולרי, נייד, ספק סלולרי, 4g,‏ 3g,‏ 2g,‏ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"הצגת רשתות בטוחות למצב טיסה"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"תיקון קישוריות"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"רשתות מצב טיסה זמינות"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"כדי לעבור בין רשתות, יש לנתק את האתרנט"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"לא ניתן להחליף רשתות כשיש חיבור לרשת אתרנט"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"רשתות הזמינות במצב טיסה"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"מחובר"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"הזנת מספר הטלפון"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"חסר מספר טלפון."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"אישור"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏אישור שימוש ב-2G"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ad94147..7919e9c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"その他のユーザー"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"デバイスのストレージ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"外部ストレージ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"位置情報に最近アクセスしたアプリはありません"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"電池使用量: 高"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"電池使用量: 低"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi のスキャンと Bluetooth のスキャン"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi スキャン"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothのスキャン"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"仕事用プロファイル向けの位置情報サービス"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置情報によるタイムゾーン検出"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置情報によるタイムゾーン検出"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"このデバイスを必要に応じてカスタマイズできます。このユーザー補助機能は後から [設定] で変更できます。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"フォントサイズを変更する"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"スクリーン リーダー"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音声と画面上のテキスト"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音声"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"表示"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"テキストとディスプレイ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"画面を暗くする"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"赤 / 緑"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"赤 / 緑"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"青 / 黄"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"明るさを下げる"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"スマートフォンで設定できる最低限の明るさよりも画面を暗くします"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"タブレットで設定できる最低限の明るさよりも画面を暗くします"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"画面を暗くして表示を見やすくします。&lt;br/&gt;&lt;br/&gt; 次のような場合に便利です。&lt;ol&gt; &lt;li&gt; デフォルトの最低限の明るさでも、スマートフォンの画面が明るすぎる&lt;/li&gt; &lt;li&gt; 夜の時間帯や就寝前の照明を消した部屋など、暗い場所でスマートフォンを使用している&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"着信音"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"その他の音やバイブレーション"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"会話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"通知を最近送信したアプリ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"過去 7 日間をすべて表示"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"詳細設定"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"全般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"仕事用プロファイルの通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"通知の自動調整"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"通知の自動調整の優先度"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"プルダウン シェード、ステータスバー、ロック画面に表示されます"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ステータスバーにサイレント通知を表示しない"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"点滅"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ロック画面上の通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"プライバシー"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ロック画面をスキップ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"顔認証後、最後に使用していた画面に直接移動する"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ロック 画面, ロック画面, スキップ, バイパス"</string>
@@ -3663,14 +3679,14 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"通知へのアクセスをリクエストしたインストール済みアプリはありません。"</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"通知へのアクセスを許可"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"通知へのアクセスを<xliff:g id="SERVICE">%1$s</xliff:g>に許可しますか？"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> はすべての通知を読み取ることができます。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなどの通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
-    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g>での通知へのアクセスを許可しますか？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> はすべての通知を読み取ることができます。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなどの通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなど、通知内の操作ボタンをタップしたりすることも許可されます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
+    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> による通知へのアクセスを許可しますか？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなど、通知内の操作ボタンをタップしたりすることも許可されます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> の通知アクセスを OFF にすると、サイレント モードのアクセスも OFF になります。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"OFF にする"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"キャンセル"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"許可されている通知の種類"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"重要な継続的通知"</string>
+    <string name="notif_type_ongoing" msgid="2295338067608686711">"重要な進行中の通知"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"会話の通知"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"アラート通知"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"サイレント通知"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 個の制限</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"デバイスで記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"携帯通信会社のネットワークで使用したデータ使用量は除外しています"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"携帯通信会社のネットワークで使用したデータ使用量は除外しています"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 使用"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"データ使用量を警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"警告するデータ使用量"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ネットワーク動作モードの変更"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"優先ネットワークの種類"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"携帯通信会社"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定のバージョン"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"携帯通信会社のビデオ通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"システムの選択"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM カードを取り出して、もう一度挿入してください。問題が解決しない場合は、デバイスを再起動してください。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM をもう一度 ON にしてみてください。問題が解決しない場合は、デバイスを再起動してください。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ネットワークの有効化"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"携帯通信会社の切り替え"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> は有効です"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM の設定を更新するにはタップしてください"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えました"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"使用不可"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"一時的に利用できません"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM なし"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ネットワーク設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"パブリック ネットワークに接続する"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ネットワーク接続, インターネット, ワイヤレス, データ, wifi, Wi-Fi, ワイファイ, 携帯, モバイル, 携帯通信会社, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"機内モードのネットワークを表示"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"接続を修正"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"機内モード ネットワークを利用できます"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ネットワークを切り替えるには、イーサネット接続を解除してください"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"接続中はネットワークを切り替えられません"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"機内モード ネットワーク"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"接続済み"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"電話番号を入力"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"電話番号が指定されていません。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G の許可"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a6bb375..8642b9e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1472,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"სხვა მომხმარებლები"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"მოწყობილობის მეხსიერება"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"პორტატული მეხსიერება"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"მაღვიძარები და შეხსენებები"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"მაღვიძარებისა და შეხსენებების დაყენების დაშვება"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"მაღვიძარები და შეხსენებები"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ამ აპს საშუალებას მისცემს, შეიტანოს განრიგში მაღვიძარები ან დროზე დაფუძნებული სხვა მოვლენები. ეს აპს საშუალებას მისცემს, გაიღვიძოს და გაიშვას, თუნდაც იმ მომენტში მოწყობილობით არ სარგებლობდეთ. გაითვალისწინეთ, რომ ამ ნებართვის გაუქმებამ შეიძლება აპის გაუმართაობა გამოიწვიოს, კონკრეტულად, აპის მიერ განრიგში შეტანილი არცერთი მაღვიძარა აღარ იმუშავებს."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"განრიგი, მაღვიძარა, შეხსენება, მოვლენა"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"გამოყენებულია <xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>-დან"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"გამოყენებულია <xliff:g id="TOTAL">%1$s</xliff:g>-დან"</string>
@@ -1733,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ბოლო ხანებში არცერთ აპს არ ჰქონია წვდომა მდებარეობაზე"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"მძლავრი ბატარეა"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"სუსტი ბატარეა"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi და Bluetooth კავშირების სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"აპების და სერვისებისთვის Wi‑Fi ქსელების ნებისმიერ დროს სკანირების ნებართვის მინიჭება, მაშინაც კი, როცა Wi‑Fi გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth სკანირება"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"აპებისა და სერვისებისთვის სკანირების ნებართვის მინიჭება ახლომდებარე მოწყობილობების ნებისმიერ დროს აღმოსაჩენად, მაშინაც კი, როცა Bluetooth გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"მდებარეობის სერვისები"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"მდებარეობის სერვისები სამსახურისთვის"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
@@ -2138,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"შრიფტის ზომის შეცვლა"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ეკრანის წამკითხველები"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"სუბტიტრები"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"აუდიო"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ზოგადი"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ეკრანი"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ტექსტი და ჩვენება"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ეკრანის მუქი რეჟიმის ჩართვა"</string>
@@ -2291,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ლურჯი-ყვითელი"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"სიკაშკაშის შემცირება"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"დააყენეთ ტელეფონის ეკრანის მინიმალურ სიკაშკაშეზე უფრო მუქი რეჟიმი"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"დააყენეთ ტაბლეტის ეკრანის მინიმალურ სიკაშკაშეზე უფრო მუქი რეჟიმი"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"დააყენეთ მუქი რეჟიმი და გაიმარტივეთ კითხვა.&lt;br/&gt;&lt;br/&gt; ეს დაგეხმარებათ, როცა: &lt;ol&gt; &lt;li&gt; თქვენი ეკრანის ნაგულისხმევი მინიმალური სიკაშკაშე მაინც ძალიან მაღალია&lt;/li&gt; &lt;li&gt; თქვენ თქვენს ტელეფონს ბნელ გარემოში იყენებთ, მაგალითად, ღამით ან ბნელ ოთახში ძილის წინ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ზარები"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"სხვა ხმები და ვიბრაცია"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"შეტყობინებები"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"საუბარი"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ახლახან გაგზავნილი"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ყველაფრის ნახვა ბოლო 7 დღიდან"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"გაფართოებული"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ზოგადი"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"სამსახურის შეტყობინებები"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ადაპტაციური შეტყობინებები"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ადაპტაციური შეტყობინების პრიორიტეტულობა"</string>
@@ -3562,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"გამოჩნდება ჩამოსაწევ ფარდაში, სტატუსის ზოლში და ჩაკეტილ ეკრანზე"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ჩუმი შეტყობინებების დამალვა სტატუსის ზოლში"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"სინათლის ციმციმი"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"შეტყობინებები ჩაკეტილ ეკრანზე"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"კონფიდენციალურობა"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ჩაკეტილი ეკრანის გამოტოვება"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"სახით განბლოკვის შემდეგ ბოლოს გამოყენებულ ეკრანზე გადასვლა"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ჩაკეტილი ეკრანი, დაბლოკილი ეკრანი, გამოტოვება, გვერდის ავლა"</string>
@@ -3674,13 +3683,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"მიმოწერის შეტყობინებები"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"გამაფრთხილებელი შეტყობინებები"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ჩუმი შეტყობინებები"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"აპები, რომლებიც ამ მსმენელთან დაკავშირებული არ არის"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ყველა აპი დაკავშირებულია"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d აპი დაკავშირებული არ არის</item>
+      <item quantity="one">%d აპი დაკავშირებული არ არის</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"დაკავშირებული აპები"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ვირტუალური რეალობის დამხმარე სერვისები"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ვირტუალური სერვისის დამხმარე სერვისად გაშვება არცერთ დაინსტალირებულ აპს არ მოუთხოვია."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"გსურთ ვირტუალური რეალობის სერვისისთვის <xliff:g id="SERVICE">%1$s</xliff:g>-ზე წვდომის დაშვება?"</string>
@@ -4342,7 +4351,7 @@
       <item quantity="one">1 შეზღუდვა</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ოპერატორი თქვენ მიერ მოხმარებულ ინტერნეტს შეიძლება მოწყობილობისგან განსხვავებულად ითვლიდეს"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"გამორიცხავს მონაცემებს, რომლებსაც ოპერატორის ქსელები იყენებს"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"გამორიცხავს მონაცემებს, რომლებსაც ოპერატორის ქსელები იყენებს"</string>
     <string name="data_used_template" msgid="8229342096562327646">"გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"მონაც. გაფრთხილების დაყენება"</string>
     <string name="data_warning" msgid="2925054658166062884">"მოხმარების შესახებ გაფრთხილება"</string>
@@ -4886,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ქსელის მუშაობის რეჟიმის შეცვლა"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ქსელის სასურველი ტიპი"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ოპერატორი"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"პარამეტრების ვერსია"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ოპერატორის პარამეტრების ვერსია"</string>
     <string name="call_category" msgid="641461844504128789">"დარეკვა"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ვიდეო დარეკვა ოპერატორით"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"სისტემის არჩევა"</string>
@@ -4935,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ამოიღეთ SIM ბარათი და მოათავსეთ ის ხელახლა. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ცადეთ, ხელახლა ჩართოთ SIM ბარათი. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ქსელის გააქტიურება"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ოპერატორის გადართვა"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> აქტიურია"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"შეეხეთ SIM-ბარათის პარამეტრების გასაახლებლად"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"გადართულია <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე"</string>
@@ -5110,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"მიუწვდომელი"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"დროებით მიუწვდომელია"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM არ არის"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"პრიორიტეტები"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ქსელის პარამეტრები"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"საჯარო ქსელებთან დაკავშირება"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ქსელთან კავშირი, ინტერნეტი, უსადენო, მონაცემები, wifi, wi-fi, wi fi, ფიჭური, მობილური, ფიჭური ოპერატორი, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"თვითმფრინავის რეჟიმის ქსელების ნახვა"</string>
@@ -5124,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"კავშირის გასწორება"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"თვითმფრინავის რეჟიმის ქსელები ხელმისაწვდომია"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ქსელების გადასართავად, გაწყვიტეთ ethernet-თან კავშირი"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"აქტიური კავშირის დროს ქსელების გადართვა შეუძლებელია"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"თვითმფრინავის რეჟიმის ქსელები"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"დაკავშირებული"</string>
@@ -5159,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"შეიყვანეთ ტელეფონის ნომერი"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ტელეფონის ნომერი აკლია."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"კარგი"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G-ის დაშვება"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2d20f1e..ca8dc64 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Экрандағы мәтінді кішірейтеді немесе үлкейтеді."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Кішірек ету"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Үлкенірек ету"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоматты бұруды пайдалану"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Бет негізіндегі Автоматты бұру функциясы экранға қараған адамды тану үшін алдыңғы камераны пайдаланады. Бұл функция жатып оқуға мүмкіндік береді, сонымен қатар суреттер Google-ға сақталмайды және жіберілмейді.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Толығырақ&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Мәтін үлгісі"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Оз қаласының ғажап сиқыршысы"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11-тарау: Ғажайып жасыл қала Оз"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Іздеу"</string>
     <string name="display_settings" msgid="7197750639709493852">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Экранды автоматты бұру"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Өшіру"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Қосу"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Қосулы – Бет негізінде"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Бетті анықтауды қосу"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстер"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табиғи"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Жарқын"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Басқа пайдаланушылар"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Құрылғы жады"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Портативті жад"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ішінен <xliff:g id="USED">%1$s</xliff:g> қолданылған"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ішінен қолданылған"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Геодеректерді жақын арада ешқандай қолданба пайдаланбаған."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Жоғары деңгейде батарея қолдану"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батарея шығыны аз"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi желілері мен Bluetooth сигналын іздеу"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi іздеу"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Қолданбаларға және қызметтерге Wi-Fi өшірулі кезде де Wi-Fi желілерін кез келген уақытта іздеуге рұқсат ету. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth іздеу"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өшірулі болса да, қолданбалар мен қызметтерге маңайдағы құрылғыларды іздеуге рұқсат беру. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жұмыс профиліне арналған орынды анықтау қызметтері"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Орынның уақыт белдеуін анықтау"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Орынның уақыт белдеуін анықтау"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Қаріп өлшемін өзгерту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экранды оқу құралдары"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио және экранға шығатын мәтін"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Жазулар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Мәтін және көрсету"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды қараңғылау"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк – сары"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Жарықтығын азайту"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Экран жарықтығын телефондағы минималды жарықтықтан да азайту"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Экран жарықтығын планшеттегі минималды жарықтықтан да азайту"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Экранды қараңғыласаңыз, оқу да ыңғайлы болады.&lt;br/&gt;&lt;br/&gt; Мұның пайдалы болатын кездері: &lt;ol&gt; &lt;li&gt; телефонның әдепкі минималды жарықтығы әлі жоғары деңгейде болса;&lt;/li&gt; &lt;li&gt; телефонды түнде немесе ұйықтар алдында қараңғы бөлмеде пайдалансаңыз.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтондар"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Басқа дыбыстар мен дірілдер"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Хабарландырулар"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Әңгіме"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Жақында жіберілді"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Соңғы 7 күндегі барлық қолданбаларды көру"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Қосымша"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Жалпы"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Жұмыс хабарландырулары"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Бейімделетін хабарландырулар"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Бейімделетін хабарландырулар басымдығы"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ашылмалы панельге, күй жолағына және құлыптаулы экранға шығады."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Күй жолағындағы дыбыссыз хабарландыруларды жасыру"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жыпылықтаған жарық"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Құлыптаулы экрандағы хабарландырулар"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Құпиялылық"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Құлыптаулы экранды өткізу"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Face Unlock-тан кейін бірден соңғы ашылған экранға өту"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Құлып экраны, құлыптаулы экран, өткізіп жіберу, өткізу"</string>
@@ -3657,7 +3667,7 @@
       <item quantity="one">Аптасына ~<xliff:g id="NUMBER_0">%d</xliff:g> хабарландыру</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ешқашан"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Хабарландыруларды пайдалану"</string>
+    <string name="manage_notification_access_title" msgid="4714320299084782521">"Хабарлар пайдалану"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Жұмыс профилінің хабарландыруларына кіру бөгелген"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Қолданбалар хабарларды оқи алмайды."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Әңгіме хабарландырулары"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Ескертуші хабарландырулар"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Дыбыссыз хабарландырулар"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Бұл тыңдау қызметіне қосылмаған қолданбалар"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Барлық қолданба қосылған"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d қолданба қосылмаған</item>
+      <item quantity="one">%d қолданба қосылмаған</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Қосылған қолданбалар"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Виртуалды шынайылық көмекші қызметтері"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнатылған қолданбалар виртуалды шынайылық көмекші қызметтері ретінде іске қосуды сұрамады."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Виртуалды шынайылық қызметінің <xliff:g id="SERVICE">%1$s</xliff:g> қызметіне кіруіне рұқсат ету керек пе?"</string>
@@ -3905,7 +3915,7 @@
     <string name="zen_mode_when_weeknights" msgid="531342225633264368">"Жұмыс күн-гі түндер"</string>
     <string name="zen_mode_start_time" msgid="1252665038977523332">"Басталу уақыты"</string>
     <string name="zen_mode_end_time" msgid="223502560367331706">"Аяқталу уақыты"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"Келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Мерзімсіз \"дабылдар ғана\" режиміне өзгерту"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="other">Дабылдарды (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін) <xliff:g id="DURATION">%1$d</xliff:g> минутқа ғана өзгерту</item>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 шектеу</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператордың деректер есебі құрылғының есебінен өзгеше болуы мүмкін."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор желілері пайдаланған деректерді қамтымайды."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Оператор желілері пайдаланған деректерді қамтымайды."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> пайдаланылған"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Дерек шығыны туралы ескерту"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дерек шығыны туралы ескерту"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Желі жұмысының режимін өзгерту"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Оңтайлы желі түрі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Параметрлер нұсқасы"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Қоңырау"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Оператор желісімен жасалатын бейне қоңыраулар"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Жүйе таңдау"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM картасын шығарып, қайта салыңыз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM картасын қайтадан қосып көріңіз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Желіні іске қосу"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Операторды ауыстыру"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қосулы"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM параметрлерін жаңарту үшін түртіңіз."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторына ауысты"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"қолжетімді емес"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Уақытша қолжетімді емес"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM картасы жоқ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметрлер"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Желі параметрлері"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Қоғамдық жерлердегі желілерге қосылу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"желі байланысы, интернет, сымсыз байланыс, деректер, wifi, Wi-Fi, Wi Fi, ұялы, мобильдік, ұялы байланыс операторы, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ұшақта қолдануға болатын желілерді көру"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Қосылу мүмкіндігін түзету"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ұшақ режиміндегі желілер қолжетімді."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Желілерді ауыстыру үшін ethernet кабелін ажыратыңыз."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Қосулы болса, желілерді ауыстыру мүмкін емес."</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ұшақ режимі желілері"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Қосылды"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон нөмірін енгізіңіз"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефон нөмірі енгізілмеген."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Жарайды"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G қолдануға рұқсат беру"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 083c2ed..7cd5525 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"អ្នក​ប្រើ​ប្រាស់ផ្សេងទៀត"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ឧបករណ៍ផ្ទុក"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ឧបករណ៍ផ្ទុកចល័ត"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"បានប្រើ <xliff:g id="USED">%1$s</xliff:g> នៃ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ការប្រើនៃ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"មិនមានកម្មវិធីបានចូលប្រើទីតាំងកាលពីថ្មីៗនេះទេ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ប្រើ​ថ្ម​ច្រើន"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"​ប្រើ​ថ្ម​តិច"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ការស្កេន Wi‑Fi និងប៊្លូធូស"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ការស្កេន Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​បណ្ដាញ Wi‑Fi បាន​គ្រប់ពេល ទោះបីជា Wi‑Fi ​បិទក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ការស្កេនប៊្លូធូស"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបីជា​ប៊្លូធូសបិទ​ក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"សេវាកម្មទីតាំង​សម្រាប់​ការងារ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"អ្នកអាចកែសម្រួលឧបករណ៍នេះឲ្យសមតាម​តម្រូវការរបស់អ្នក។ មុខងារនៃភាព​ងាយស្រួលទាំងនេះអាចផ្លាស់​ប្តូរពេលក្រោយបាននៅក្នុងការកំណត់។"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ប្ដូរ​ទំហំពុម្ពអក្សរ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"កម្មវិធី​អានអេក្រង់"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"អក្សររត់"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"សំឡេង"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"បង្ហាញ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"អក្សរ និងការបង្ហាញ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ធ្វើឱ្យអេក្រង់ងងឹតជាងមុន"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ខៀវ-លឿង"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"បន្ថយពន្លឺ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ធ្វើឱ្យអេក្រង់ងងឹតជាងពន្លឺអប្បបរមារបស់ទូរសព្ទអ្នក"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ធ្វើឱ្យអេក្រង់ងងឹតជាងពន្លឺអប្បបរមារបស់ថេប្លេតអ្នក"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ធ្វើឱ្យអេក្រង់របស់អ្នកងងឹតជាងមុន ដើម្បីឱ្យកាន់តែងាយស្រួលអាន។&lt;br/&gt;&lt;br/&gt; ការធ្វើបែបនេះអាចមានប្រយោជន៍ នៅពេល៖ &lt;ol&gt; &lt;li&gt; ពន្លឺអប្បបរមាលំនាំដើមរបស់ទូរសព្ទអ្នកនៅតែភ្លឺខ្លាំងនៅឡើយ&lt;/li&gt; &lt;li&gt; អ្នកកំពុងប្រើទូរសព្ទរបស់អ្នកនៅក្នុងស្ថានភាពងងឹតដូចជា នៅពេលយប់ ឬក្នុងបន្ទប់ងងឹតមុនពេលចូលគេងជាដើម&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"សំឡេង​រោទ៍"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"សំឡេង និង​ការ​ញ័រ​ផ្សេងទៀត"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ការ​ជូនដំណឹង"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ការ​សន្ទនា"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"បានផ្ញើថ្មីៗ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"មើល​ទាំងអស់​ចាប់​ពី​ 7 ថ្ងៃមុន"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"កម្រិតខ្ពស់"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ទូទៅ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ការជូនដំណឹងពីកន្លែងធ្វើការ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ការជូនដំណឺង​ដែល​មានភាព​បត់បែន"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"អាទិភាពនៃ​ការជូនដំណឹង​ដែលមាន​ភាពបត់បែន"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"បង្ហាញ​ក្នុងផ្ទាំង​ទាញចុះ របារ​ស្ថានភាព និងនៅលើ​អេក្រង់ចាក់សោ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"លាក់​ការជូនដំណឹង​ស្ងាត់ៗ​នៅក្នុង​របារ​ស្ថានភាព"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ភ្លើងលោត"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ការជូនដំណឹង​នៅលើ​អេក្រង់ចាក់សោ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ឯកជនភាព"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"រំលង​អេក្រង់ចាក់សោ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"បន្ទាប់ពី​ដោះសោតាមទម្រង់មុខរួច សូមចូលទៅ​អេក្រង់​ដែលបានប្រើ​ចុងក្រោយ​តែម្ដង"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ចាក់សោ​អេក្រង់ អេក្រង់​ចាក់សោ រំលង ការរំលង"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"ការ​ជូនដំណឹងអំពីការសន្ទនា"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"ការជូនដំណឹង​ញ័រ ឬរោទ៍"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ការជូនដំណឹង​ស្ងាត់"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"កម្មវិធី​ដែលមិនត្រូវបាន​ភ្ជាប់ទៅ​អ្នកស្ដាប់​នេះ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"កម្មវិធី​ទាំងអស់​ត្រូវបានភ្ជាប់"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">កម្មវិធី %d មិនត្រូវបាន​ភ្ជាប់ទេ</item>
+      <item quantity="one">កម្មវិធី %d មិនត្រូវបាន​ភ្ជាប់ទេ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"កម្មវិធី​ដែលបាន​ភ្ជាប់"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"សេវាកម្មជំនួយ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"មិនមានកម្មវិធីដែលបានដំឡើងត្រូវបានស្នើឲ្យដំណើរការជាសេវាកម្មជំនួយ VR នោះទេ។"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"អនុញ្ញាតឲ្យសេវាកម្ម VR ចូលដំណើរការ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">ការដាក់កំហិត 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនារបស់ឧបករណ៍"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"មិនរួមបញ្ចូល​ទិន្នន័យ​ដែលប្រើ​ដោយ​បណ្ដាញដែលមានប្រភព​មកពីក្រុមហ៊ុនសេវាទូរសព្ទ​ទេ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"មិនរួមបញ្ចូលទិន្នន័យ​ដែលប្រើដោយបណ្ដាញដែលមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទទេ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"កំណត់ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ប្ដូរ​មុខងារ​​​ប្រតិបត្តិការ​បណ្ដាញ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ប្រភេទ​បណ្ដាញ​​ដែលប្រើជាអាទិភាព​"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"កំណែការកំណត់"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"ការហៅទូរសព្ទ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ការហៅ​ជា​វីដេអូ​តាម​រយៈក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ការជ្រើស​រើសប្រព័ន្ធ"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"សូមដកស៊ីម រួចបញ្ចូលឡើងវិញ។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"សូម​សាកល្បង​បើកស៊ីមម្ដងទៀត។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ការបើកដំណើរការ​បណ្ដាញ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ការប្ដូរក្រុមហ៊ុន​សេវា​ទូរសព្ទ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> កំពុង​ដំណើរការ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ចុច​ដើម្បី​ធ្វើបច្ចុប្បន្នភាព​ការកំណត់​ស៊ីម"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"បាន​ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"មិនអាចប្រើ​បានទេ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"មិន​អាច​ប្រើ​បាន​ជា​បណ្ដោះអាសន្ន​"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"មិនមានស៊ីមទេ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ចំណូលចិត្ត"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ចំណូលចិត្ត​បណ្តាញ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ភ្ជាប់ជាមួយ​បណ្ដាញសាធារណៈ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ការតភ្ជាប់បណ្ដាញ, អ៊ីនធឺណិត, ឥតខ្សែ, ទិន្នន័យ, wifi, wi-fi, wi fi, បណ្ដាញចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​សេវាទូរសព្ទចល័ត, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"មើលបណ្ដាញ​នៃមុខងារពេល​ជិះ​យន្តហោះ"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ដោះស្រាយ​ការតភ្ជាប់"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"មានបណ្ដាញ​នៃមុខងារ​ពេលជិះ​យន្តហោះ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ដើម្បី​ប្ដូរ​បណ្ដាញ សូមផ្ដាច់​អ៊ីសឺរណិត"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ខណៈពេលភ្ជាប់ មិនអាចប្ដូរបណ្ដាញបានទេ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"បណ្ដាញ​ពេល​ជិះ​យន្តហោះ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"បានភ្ជាប់"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"បញ្ចូល​លេខទូរសព្ទ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"មិនបានបញ្ចូល​លេខទូរសព្ទ​ទេ។"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"យល់ព្រម"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"អនុញ្ញាត 2G"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index cd8259d..9e2bf0f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ಪರದೆಯ ಮೇಲೆ ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಹಿಗ್ಗಿಸಿ ಅಥವಾ ಕುಗ್ಗಿಸಿ."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ಚಿಕ್ಕದಾಗಿಸು"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ದೊಡ್ಡದಾಗಿಸು"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ಸ್ವಯಂ-ತಿರುಗುವಿಕೆಯನ್ನು ಬಳಸಿ"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ಯಾರಾದರೂ ಸ್ಕ್ರೀನ್ ಅನ್ನು ನೋಡುತ್ತಿದ್ದಾರೆಯೇ ಮತ್ತು ಹೇಗೆ ನೋಡುತ್ತಿದ್ದಾರೆ ಎಂಬುದನ್ನು ವೀಕ್ಷಿಸಲು ಮುಖ ಆಧಾರಿತ ಸ್ವಯಂತಿರುಗುವಿಕೆಯು ಮುಂಬದಿ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುತ್ತದೆ. ಅದು ಮಲಗಿಕೊಂಡು ಓದಲು ಅನುಮತಿಸುತ್ತದೆ ಮತ್ತು ಚಿತ್ರಗಳನ್ನು ಎಂದಿಗೂ ಸಂಗ್ರಹಿಸಲಾಗುವುದಿಲ್ಲ ಅಥವಾ Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ಮಾದರಿ ಪಠ್ಯ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz ನ ಅದ್ಭುತವಾದ ಮಾಂತ್ರಿಕ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ಅಧ್ಯಾಯ 11: Oz ನ ಅದ್ಭುತವಾದ ಎಮೆರಾಲ್ಡ್ ಸಿಟಿ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ಆನ್ ಆಗಿದೆ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ಆನ್ ಆಗಿದೆ - ಮುಖ-ಆಧಾರಿತ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ಮುಖ ಪತ್ತೆಹಚ್ಚುವಿಕೆ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ಬಣ್ಣಗಳು"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ಪ್ರಾಕೃತಿಕ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ಬೂಸ್ಟ್ ಮಾಡಿರುವುದು"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ಇತರ ಬಳಕೆದಾರರು"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ಪೋರ್ಟಬಲ್‌ ಸಂಗ್ರಹಣೆ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="USED">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ರಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿಲ್ಲ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ಹೆಚ್ಚು ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ಕಡಿಮೆ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ವೈ-ಫೈ ಮತ್ತು ಬ್ಲ್ಯೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ವೈ-ಫೈ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮುಯದಲ್ಲಾದರೂ ವೈ-ಫೈಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ಕೆಲಸಕ್ಕಾಗಿ ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ಫಾಂಟ್ ಗಾತ್ರ ಬದಲಿಸಿ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ಶೀರ್ಷಿಕೆಗಳು"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ಆಡಿಯೊ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ಪ್ರದರ್ಶನ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ಪಠ್ಯ ಮತ್ತು ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಇನ್ನಷ್ಟು ಡಾರ್ಕ್ ಆಗಿಸಿ"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ನೀಲಿ-ಹಳದಿ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ಪ್ರಖರತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಿ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್‌ನ ಕನಿಷ್ಠ ಪ್ರಖರತೆಗಿಂತ ಡಾರ್ಕ್ ಮಾಡಿ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಕನಿಷ್ಠ ಪ್ರಖರತೆಗಿಂತ ಡಾರ್ಕ್ ಮಾಡಿ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ಓದುವುದನ್ನು ಹೆಚ್ಚು ಆರಾಮದಾಯಕವಾಗಿಸಲು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಡಾರ್ಕ್ ಮಾಡಿ.&lt;br/&gt;&lt;br/ಇದರಿಂದ ಈ ಕೆಳಗಿನ ಸಂದರ್ಭಗಳಲ್ಲಿ ಅನುಕೂಲವಾಗುತ್ತದೆ: &lt;ol&gt; &lt;li&gt; ನಿಮ್ಮ ಫೋನ್‌ನ ಡೀಫಾಲ್ಟ್ ಕನಿಷ್ಠ ಪ್ರಖರತೆ ಬಹಳ ಪ್ರಖರವಾಗಿದ್ದಾಗ&lt;/li&gt; &lt;li&gt; ನೀವು ರಾತ್ರಿ ವೇಳೆ ಅಥವಾ ಮಲಗುವ ಮೊದಲು ಕತ್ತಲೆ ಕೋಣೆಯಲ್ಲಿ, ಇಂತಹ ಕತ್ತಲಿರುವ ಸಂದರ್ಭಗಳಲ್ಲಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಬಳಸುತ್ತಿರುವಾಗ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ರಿಂಗ್‌ಟೋನ್‌ಗಳು"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ಇತರ ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ ಆದ್ಯತೆಗಳು"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ಸಂವಾದ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ಇತ್ತೀಚೆಗೆ ಕಳುಹಿಸಿರುವುದು"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ಕಳೆದ 7 ದಿನಗಳಿಂದ ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ಸುಧಾರಿತ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ಸಾಮಾನ್ಯ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ಹೊಂದಿಸಬಲ್ಲ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ಅಡಾಪ್ಟಿವ್‌ ಅಧಿಸೂಚನೆಯ ಆದ್ಯತೆ"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನಲ್ಲಿ, ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ನಿಶ್ಶಬ್ಧ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ಮಿನುಗುವ ಲೈಟ್‌"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಅಧಿಸೂಚನೆ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ಗೌಪ್ಯತೆ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ಫೇಸ್ ಅನ್‌ಲಾಕ್‌ನ ನಂತರ, ಕೊನೆಗೆ ಬಳಸಿದ ಸ್ಕ್ರೀನ್‌ಗೆ ನೇರವಾಗಿ ಹೋಗಿ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ಲಾಕ್ ಸ್ಕ್ರೀನ್, ಲಾಕ್‌ಸ್ಕ್ರೀನ್, ಸ್ಕಿಪ್ ಮಾಡಿ, ಬೈಪಾಸ್"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"ಸಂಭಾಷಣೆಯ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"ಎಚ್ಚರಿಸುವ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ನಿಶ್ಶಬ್ಧ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ಈ ಕೇಳುಗರಿಗೆ ಕನೆಕ್ಟ್ ಆಗಿರದ ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳು ಕನೆಕ್ಟ್ ಆಗಿವೆ"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d ಆ್ಯಪ್‌ಗಳು ಕನೆಕ್ಟ್ ಆಗಿಲ್ಲ</item>
+      <item quantity="other">%d ಆ್ಯಪ್‌ಗಳು ಕನೆಕ್ಟ್ ಆಗಿಲ್ಲ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ಕನೆಕ್ಟ್ ಆಗಿರುವ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ಸಹಾಯ ಸೇವೆಗಳು"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು VR ಸಹಾಯಕ ಸೇವೆಗಳ ರೀತಿಯಲ್ಲಿ ರನ್ ಮಾಡಲು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ VR ಸೇವೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ನಿರ್ಬಂಧಗಳು</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ಸಾಧನ ಲೆಕ್ಕಾಚಾರಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ವಾಹಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಬಳಸುವ ಡೇಟಾವನ್ನು ಹೊರತುಪಡಿಸುತ್ತದೆ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ವಾಹಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಬಳಸುವ ಡೇಟಾವನ್ನು ಹೊರತುಪಡಿಸುತ್ತದೆ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ಡೇಟಾ ಎಚ್ಚರಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ನೆಟ್‌ವರ್ಕ್‌ ಕಾರ್ಯಾಚರಣೆ ಮೋಡ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಪ್ರಕಾರ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ಕ್ಯಾರಿಯರ್"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಆವೃತ್ತಿ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ಸಿಮ್ ಅನ್ನು ಮತ್ತೆ ಆನ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ನೆಟ್‌ವರ್ಕ್ ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ವಾಹಕ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗಿದೆ"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ತಾತ್ಕಾಲಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ನೆಟ್‌ವರ್ಕ್ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್, ಇಂಟರ್ನೆಟ್, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, ವೈಫೈ, ವೈ-ಫೈ, ವೈ ಫೈ, ಸೆಲ್ಯುಲಾರ್, ಮೊಬೈಲ್, ಸೆಲ್ ವಾಹಕ, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ನೋಡಿ"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯ ದೋಷವನ್ನು ಸರಿಪಡಿಸಿ"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಲಭ್ಯವಿವೆ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಬದಲಿಸಲು, ಇಥರ್ನೆಟ್ ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ಕನೆಕ್ಟ್ ಆಗುವಾಗ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ಫೋನ್ ಸಂಖ್ಯೆ ತಪ್ಪಿಹೋಗಿದೆ."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ಸರಿ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ಅನ್ನು ಅನುಮತಿಸಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bb2541b..de31de5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"화면 텍스트를 축소 또는 확대합니다."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"축소"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"확대"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"자동 회전 사용"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"얼굴 인식 자동 회전은 전면 카메라를 사용하여 화면을 보고 있는 사용자가 있는지 확인하는 기능입니다. 누워서 읽을 때 편리한 기능이며 이미지는 저장되거나 Google로 전송되지 않습니다.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;자세히 알아보기&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"샘플 텍스트"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"오즈의 마법사"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11장: 오즈의 멋진 에메랄드 도시"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"검색"</string>
     <string name="display_settings" msgid="7197750639709493852">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"화면 자동 회전"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"꺼짐"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"켜짐"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"켜짐 - 얼굴 기반"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"얼굴 인식 사용"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"색상"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"자연스럽게"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"생생하게"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"다른 사용자"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"기기 저장용량"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"휴대용 저장소"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"최근에 위치에 액세스한 앱 없음"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"배터리 사용량 많음"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"배터리 사용량 적음"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 및 블루투스 검색"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi 검색"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi가 꺼져 있을 때도 항상 앱과 서비스에서 Wi-Fi 네트워크를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"블루투스 검색"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"업무용 위치 서비스"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"위치 시간대 감지"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"위치 시간대 감지"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"글꼴 크기 변경"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"스크린 리더"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"오디오 및 화면에 있는 텍스트"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"자막"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"오디오"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"디스플레이"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"텍스트 및 화면"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"화면 어둡게"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"적녹색약"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"적녹색약"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"청황색약"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"밝기 낮추기"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"화면을 휴대전화의 최소 밝기보다 더 어둡게 설정합니다"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"화면을 태블릿의 최소 밝기보다 더 어둡게 설정합니다"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"읽기 쉽도록 화면을 어둡게 만듭니다.&lt;br/&gt;&lt;br/&gt; 다음과 같은 경우 어두운 화면이 도움이 됩니다. &lt;ol&gt; &lt;li&gt; 휴대전화를 기본 최소 밝기로 설정해도 여전히 너무 밝을 때&lt;/li&gt; &lt;li&gt; 밤에 또는 자기 전 어두운 실내에서 휴대전화를 사용할 때&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"벨소리"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"기타 소리 및 진동"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"알림"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"대화"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"최근에 알림을 보낸 앱"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"지난 7일간의 모든 항목 보기"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"고급"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"일반"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"직장 알림"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"적응형 알림"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"적응형 알림 우선순위"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"풀다운 창, 상태 표시줄, 잠금 화면에 표시됩니다."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"상태 표시줄에서 무음 알림 숨기기"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"표시등 깜박임"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"잠금 화면에 알림 표시"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"개인정보 보호"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"잠금 화면 건너뛰기"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"얼굴인식 잠금해제 후 최근 사용한 화면으로 바로 이동"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"잠금 화면, 잠금화면, 건너뛰기, 우회"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"대화 알림"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"소리 알림"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"무음 알림"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"이 리스너와 연결되지 않은 앱"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"모든 앱이 연결됨"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d개의 앱이 연결되지 않음</item>
+      <item quantity="one">%d개의 앱이 연결되지 않음</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"연결된 앱"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 도우미 서비스"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"설치된 앱 중에서 VR 도우미 서비스로 실행되도록 요청한 앱이 없습니다."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR 서비스가 <xliff:g id="SERVICE">%1$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">제한 1개</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"기기에 표시되는 데이터 사용량은 이동통신사에서 산출한 데이터 사용량과 다를 수 있습니다."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"이동통신사 네트워크를 통해 사용한 데이터는 제외됩니다."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"이동통신사 네트워크를 통해 사용된 데이터는 제외됩니다."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"데이터 경고 설정"</string>
     <string name="data_warning" msgid="2925054658166062884">"데이터 경고"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"네트워크 작동 모드 변경"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"기본 네트워크 유형"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"이동통신사"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"설정 버전"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"통화"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"이동통신사 화상 통화"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"시스템 선택"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM을 삭제하고 다시 삽입해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM을 다시 사용 설정해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"네트워크 활성화"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"이동통신사 전환"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>이(가) 활성화됨"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM 설정을 업데이트하려면 탭하세요."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>(으)로 전환됨"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"사용할 수 없음"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"일시적으로 사용할 수 없음"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM 없음"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"환경설정"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"네트워크 환경설정"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"공용 네트워크에 연결"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"네트워크 연결, 인터넷, 무선, 데이터, Wifi, Wi-Fi, Wi Fi, 셀룰러, 모바일, 이동통신사, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"비행기 모드 네트워크 보기"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"연결 문제 해결"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"비행기 모드 네트워크 사용 가능"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"네트워크를 전환하려면 이더넷을 연결 해제하세요."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"연결된 상태에서는 네트워크를 전환할 수 없음"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"비행기 모드 네트워크"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"연결됨"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"전화번호 입력"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"전화번호를 입력하세요."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"확인"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G 허용"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d4ca6bf..9e7b869 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Экрандагы текстти кичирейтип же чоңойтуңуз."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Кичирээк кылуу"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Чоңураак кылуу"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоматтык бурулууну колдонуу"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Face based Autorotate экранды кимдир-бирөө карап жатканын текшерүү үчүн маңдайкы камераны колдонот. Анын жардамы менен экрандагыны жатып алып окуй аласыз жана сүрөттөр эч качан сакталбай же Google\'га жөнөтүлбөйт.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Кеңири маалымат&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Үлгү текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Оз өлкөсүнүн ажайып сыйкырчысы"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11-бөлүм: Оз өлкөсүнүн ажайып зумурут шаары"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Издөө"</string>
     <string name="display_settings" msgid="7197750639709493852">"Экран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Экранды авто буруу"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Өчүк"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Күйүк"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Күйүк – Жүздүн негизинде"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Жүздү аныктоону иштетүү"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстөр"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табигый"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Күчөтүлгөн"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Башка колдонуучулар"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Түзмөктүн сактагычы"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Ташылма сактагыч"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="USED">%1$s</xliff:g> колдонулду"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Жакында жайгашкан жерди аныктоо кызматына бир да колдонмо кирген жок"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Батарейди көп колдонуу"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батареянын кубаты үнөмдөлүүдө"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi менен Bluetooth\'ду издөө"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi издөө"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi өчүп турса да, колдонмолор менен кызматтарга Wi-Fi тармактарын издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth түзмөктөрүн издөө"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өчүп турса да, колдонмолор менен кызматтарга жакын жердеги түзмөктөрдү издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жумуш үчүн Жайгашкан жерди аныктоо кызматтары"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Арип өлчөмүн өзгөртө аласыз"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экрандагыны окугучтар"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио жана текстти окуп берүү"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Коштомо жазуулар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст жана чагылдыруу"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды караңгылатуу"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк-сары"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Экрандын жарыктыгын төмөндөтүү"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Телефонуңуздун экранынын демейки минималдуу жарыктыгынан да караңгылатыңыз"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Планшетиңиздин экранынын демейки минималдуу жарыктыгынан да караңгылатыңыз"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ыңгайлуу окуу үчүн экранды караңгылатыңыз.&lt;br/&gt;&lt;br/&gt; Бул төмөнкү учурларда пайдалуу болот: &lt;ol&gt; &lt;li&gt; Телефонуңуздун экранынын демейки минималдуу жарыктыгы дагы деле жарык болсо &lt;/li&gt; &lt;li&gt; Телефонуңузду караңгы жерлерде: түнү же уктаганга чейин караңгы уктоочу бөлмөдө колдонсоңуз&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтондор"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Башка үндөр жана дирилдөөлөр"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Билдирмелер"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Сүйлөшүү"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Акыркы жолу билдирмелерди жөнөткөн колдонмолор"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Акыркы 7 күндөгү бардык колдонмолорду көрүү"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Өркүндөтүлгөн"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Жалпы"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Жумуш боюнча билдирмелер"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Ыңгайлаштырылуучу билдирмелер"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Ыңгайлаштырылуучу билдирменин маанилүүлүгү"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Тигинен жайгашкан экранда, абал тилкесинде жана кулпуланган экранда чагылдыруу"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Үнсүз билдирмелерди абал тилкесинен жашыруу"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жарык индикатору"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Кулпуланган экрандагы билдирмелер"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Купуялык"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Экран кулпуcун өткөрүп жиберүү"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Экрандын кулпусу жүзүнөн таанып ачылгандан кийин, акыркы ачылган экранга өтөсүз"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Кулпуланган экран, кулпу экраны, өткөрүп жиберүү, айланып өтүү"</string>
@@ -3667,7 +3677,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"Ыңгайлаштырылуучу билдирмелер"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Жок"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Орнотулган колдонмолор үчүн эскертме мүмкүнчүлүгү талап кылынбайт"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"Билдирмелерге кирүү мүмкүнчүлүгүн берүү"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"Билдирмелерди алып турууга уруксат берүү"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> кызматына билдирмелерди пайдаланууга уруксат бересизби?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> колдонмосу билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алат. Мындан тышкары, билдирмелерди жаап же телефон чалууларына жооп берүү сыяктуу билдирмелердеги баскычтарды баса алат. \n\nКолдонмо \"Тынчымды алба\" режимин күйгүзүп же өчүрүп, ошондой эле анын жөндөөлөрүн өзгөртүү мүмкүнчүлүгүнө ээ болот."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонмосу үчүн билдирмелерди иштетесизби?"</string>
@@ -3678,15 +3688,15 @@
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Уруксат берилген билдирмелердин түрлөрү"</string>
     <string name="notif_type_ongoing" msgid="2295338067608686711">"Маанилүү билдирмелер"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Жазышуунун билдирмелери"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Эскертүүлөр"</string>
+    <string name="notif_type_alerting" msgid="2300039323822104165">"Шашылыш билдирүүлөр"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Үнсүз билдирмелер"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Бул кызматка байланышпаган колдонмолор"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Бардык колдонмолор туташып турат"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d колдонмо туташкан жок</item>
+      <item quantity="one">%d колдонмо туташкан жок</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Туташкан колдонмолор"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR көмөкчү кызматтары"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнотулган колдонмолор көмөкчү VR кызматы катары иштөөгө уруксат сураган жок."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR кызматына <xliff:g id="SERVICE">%1$s</xliff:g> кызматында иштөөгө уруксат берилсинби?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 чектөө</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Байланыш операторунун статистикасы түзмөгүңүздүн статистикасынан айырмаланышы мүмкүн."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Байланыш операторунун тармактары колдонгон дайын-даректерден тышкары"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Байланыш операторунун тармактары колдонгон дайын-даректерден тышкары"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Трафик тууралуу эскертүү"</string>
     <string name="data_warning" msgid="2925054658166062884">"Эскертүүлөр"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Тармактын иштөө режимин өзгөртүңүз"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Тармактын түрү"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Байланыш оператору"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Жөндөөлөрдүн версиясы"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Чалуулар"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видео чалуулар"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Системаны тандоо"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-картаны чыгарып, кайра салыңыз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-картаны кайра күйгүзүп көрүңүз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Тармакты иштетүү"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Байланыш оператору которуштурулууда"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> иштеп жатат"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM-картанын жөндөөлөрүн жаңыртуу үчүн таптап коюңуз"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> байланыш операторуна которулду"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"жеткиликсиз"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Убактылуу жеткиликсиз"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-карта жок"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Жеке жөндөөлөр"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Тармак жөндөөлөрү"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Жалпыга ачык тармактарга туташуу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"тармакка туташуу, интернет, зымсыз, маалымат, wifi, wi-fi, wi fi, уюлдук, мобилдик, байланыш оператору, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Учак режиминдеги тармактарды көрүү"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Байланышты оңдоо"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Учак режиминдеги тармактар жеткиликтүү"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Башка тармактарга которулуу үчүн Ethernet кабелин ажыратыңыз"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Туташып турганда тармактарды которууга болбойт"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Учак режиминдеги тармактар"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Туташты"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон номерин киргизиңиз"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефондун номери жетишпейт."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Макул"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G тармагына уруксат берүү"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1f59019b..cb5e271 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ຜູ່ໃຊ້ອື່ນໆ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ໜ່ວຍເກັບຂໍ້ມູນແບບພົກພາ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ໃຊ້ແລ້ວຈາກ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ໃຊ້ແລ້ວຈາກ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ບໍ່ມີແອັບໃດເຂົ້າເຖິງສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ໃຊ້ແບັດເຕີຣີ່ໜ້ອຍ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ການສະແກນ Wi‑Fi ແລະ Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ການ​ສະ​ແກນ Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາເຄືອຂ່າຍ Wi-Fi ໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Wi-Fi ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ການ​ສະ​ແກນ Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Bluetooth ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ບໍລິການສະຖານທີ່ສຳລັບວຽກ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ທ່ານສາມາດປັບແຕ່ງອຸປະກອນນີ້ໃຫ້ເໝາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ຄຸນສົມບັດຊ່ວຍເຂົ້າເຖິງເຫຼົ່ານີ້ສາມາດຖືກປ່ຽນແປງໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ປ່ຽນຂະໜາດຟອນ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ຕົວອ່ານໜ້າຈໍ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ຄຳບັນຍາຍ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ສຽງ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ການສະແດງຜົນ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ຂໍ້ຄວາມ ແລະ ການສະແດງຜົນ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ເຮັດໃຫ້ໜ້າຈໍມືດລົງ"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ສີຟ້າ-ເຫຼືອງ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ຫຼຸດຄວາມສະຫວ່າງ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດກວ່າຄວາມສະຫວ່າງຂັ້ນຕ່ຳຂອງໂທລະສັບທ່ານ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດກວ່າຄວາມສະຫວ່າງຂັ້ນຕ່ຳຂອງແທັບເລັດທ່ານ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດລົງເພື່ອໃຫ້ອ່ານໄດ້ສະບາຍຂຶ້ນ.&lt;br/&gt;&lt;br/&gt; ນີ້ຈະມີປະໂຫຍດໃນເວລາ: &lt;ol&gt; &lt;li&gt; ຄວາມສະຫວ່າງຂັ້ນຕ່ຳເລີ່ມຕົ້ນຂອງໂທລະສັບທ່ານຍັງຄົງແຈ້ງເກີນໄປ&lt;/li&gt; &lt;li&gt; ທ່ານກຳລັງໃຊ້ໂທລະສັບໃນສະຖານະການທີ່ມືດ ເຊັ່ນ: ໃນເວລາກາງຄືນ ຫຼື ໃນຫ້ອງມືດກ່ອນນອນ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ຣິງໂທນ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ສຽງ ແລະ ການສັ່ນເຕືອນອື່ນໆ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ການແຈ້ງເຕືອນ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ການສົນທະນາ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ສົ່ງຫຼ້າສຸດ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ເບິ່ງທັງໝົດຈາກ 7 ມື້ຫຼ້າສຸດ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"​ຂັ້ນ​ສູງ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ທົ່ວໄປ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ການແຈ້ງເຕືອນວຽກ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ການແຈ້ງເຕືອນແບບປັບປ່ຽນໄດ້ເອງ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ຄວາມສຳຄັນການແຈ້ງເຕືອນແບບປັບໄດ້ເອງ"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ສະແດງໃນແຖບແບບເລື່ອນລົງ, ແຖບສະຖານະ ແລະ ຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ເຊື່ອງການແຈ້ງເຕືອນງຽບໃນແຖບສະຖານະ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ກະພິບໄຟ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ຄວາມເປັນສ່ວນຕົວ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ຂ້າມໜ້າຈໍລັອກ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ຫຼັງຈາກປົດລັອກດ້ວຍໜ້າແລ້ວ, ໃຫ້ໄປທີ່ໜ້າຈໍທີ່ໃຊ້ຫຼ້າສຸດໂດຍກົງ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ໜ້າຈໍລັອກ, ຂ້າມ, ອ້ອມ"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"ການແຈ້ງເຕືອນການສົນທະນາ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"ການແຈ້ງເຕືອນການເຕືອນ"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ການແຈ້ງເຕືອນແບບງຽບ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ແອັບທີ່ບໍ່ໄດ້ເຊື່ອມຫາຕົວຟັງນີ້"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ເຊື່ອມແອັບທັງໝົດແລ້ວ"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">ບໍ່ໄດ້ເຊື່ອມ %d ແອັບ</item>
+      <item quantity="one">ບໍ່ໄດ້ເຊື່ອມ %d ແອັບ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ແອັບທີ່ເຊື່ອມແລ້ວ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ບໍລິການຕົວຊ່ວຍ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງແລ້ວທີ່ຮ້ອງຂໍໃຫ້ໃຊ້ເປັນບໍລິການຕົວຊ່ວຍ VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງບໍລິການ VR ສຳລັບ <xliff:g id="SERVICE">%1$s</xliff:g> ບໍ?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 ຂໍ້ຈຳກັດ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ການນັບຂໍ້ມູນຈາກຜູ້ໃຫ້ບໍລິການ ອາດມີຄວາມແຕກຕ່າງຈາກການນັບຂອງອຸປະກອນ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ບໍ່ຮວມການໃຊ້ອິນເຕີເນັດທີ່ຖືກໃຊ້ໂດຍເຄືອຂ່າຍຜູ້ໃຫ້ບໍລິການ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ບໍ່ຮວມປະລິມານຂໍ້ມູນອິນເຕີເນັດທີ່ໃຊ້ໂດຍເຄືອຂ່າຍຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ຕັ້ງການເຕືອນຂໍ້ມູນ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ຄຳເຕືອນຂໍ້ມູນ"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ປ່ຽນໂໝດປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ຜູ້ໃຫ້ບໍລິການ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ເວີຊັນການຕັ້ງຄ່າ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"ກຳລັງໂທ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ການໂທວິດີໂອຂອງຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ການເລືອກລະບົບ"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ກະລຸນາຖອດຊິມອອກແລ້ວໃສ່ເຂົ້າໄປໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ໃຫ້ລອງເປີດຊິມຄືນໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ການສະຫຼັບຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"ເປີດໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ຢູ່"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ແຕະເພື່ອອັບເດດການຕັ້ງຄ່າຊິມກາດ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"ສະຫຼັບໄປໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ແລ້ວ"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ບໍ່ມີຂໍ້ມູນ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ບໍ່ສາມາດໃຊ້ໄດ້ຊົ່ວຄາວ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ບໍ່ມີຊິມ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ການຕັ້ງຄ່າ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ການຕັ້ງຄ່າເຄືອຂ່າຍ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ອິນເຕີເນັດມືຖື, wifi, wi-fi, wi fi, ເຄືອຂ່າຍທືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ເບິ່ງເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ແກ້ໄຂການເຊື່ອມຕໍ່"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ສາມາດໃຊ້ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນໄດ້"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ເພື່ອສະຫຼັບເຄືອຂ່າຍ, ໃຫ້ຕັດການເຊື່ອມຕໍ່ອີເທີເນັດກ່ອນ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ບໍ່ສາມາດສະຫຼັບເຄືອຂ່າຍໄດ້ໃນຂະນະທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ໃສ່ເບີໂທລະສັບ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ບໍ່ມີເບີໂທລະສັບ."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ຕົກລົງ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"ອະນຸຍາດ 2G"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 979bc79..5864610 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Sumažinkite arba padidinkite ekrane rodomą tekstą."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Padaryti mažesnius"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Padaryti didesnius"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Naudoti automatinį pasukimą"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatinio pasukimo pagal veidą funkcija naudoja priekinį fotoaparatą, kad nustatytų, ar ir kaip kas nors žiūri į ekraną. Ją naudojant galima skaityti gulint ir vaizdai niekada nesaugomi ar nesiunčiami į sistemą „Google“.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Sužinokite daugiau&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Pavyzdinis tekstas"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Nuostabusis Ozo šalies burtininkas"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11 skyrius. Nuostabusis Smaragdo miestas"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Ieškoti"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatiškai sukti ekraną"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Išjungta"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Įjungta"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Įjungta – pagal veidą"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Įgalinti veido aptikimą"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Spalvos"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natūrali"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Suintensyvinta"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Kiti naudotojai"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Įrenginio atmintinė"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Nešiojama atmintinė"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Naudojama: <xliff:g id="USED">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Naudojama iš <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Jokios programos neseniai nepasiekė vietovės"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Naudoja daug akum. energijos"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Naudoja mažai akum. energijos"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"„Wi‑Fi“ ir „Bluetooth“ ryšio nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"„Wi‑Fi“ nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant „Wi‑Fi“ tinklų, net kai „Wi‑Fi“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"„Bluetooth“ nuskaitymas"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant netoliese esančių įrenginių, net kai „Bluetooth“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Darbui skirtos Vietovės paslaugos"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vietovės laiko juostos nustatymas"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vietovės laiko juostos nustatymas"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Galite tinkinti šį įrenginį pagal savo poreikius. Vėliau šias pritaikymo neįgaliesiems funkcijas galite pakeisti nustatymuose."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Pakeisti šrifto dydį"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrano skaitytuvai"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Garsas ir tekstas ekrane"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrai"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Garsas"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekranas"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekstas ir vaizdas"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrano tamsinimas"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Raudona, žalia"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Raudona, žalia"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mėlyna, geltona"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Šviesumo mažinimas"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Tamsinkite ekraną daugiau nei mažiausias telefono šviesumas"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Tamsinkite ekraną daugiau nei mažiausias planšetinio kompiuterio šviesumas"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Tamsinkite ekraną, kad būtų patogiau skaityti.&lt;br/&gt;&lt;br/&gt; Tai gali būti naudinga, kai: &lt;ol&gt; &lt;li&gt; nustačius numatytąjį mažiausią telefono šviesumą ekranas vis tiek pernelyg šviesus;&lt;/li&gt; &lt;li&gt; telefoną naudojate tamsioje aplinkoje, pvz., naktį arba tamsiame kambaryje prieš eidami miegoti.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Skambėjimo tonai"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Kiti garsai ir vibravimas"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Pranešimai"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pokalbis"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Neseniai išsiųsta"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Žiūrėti visas pastarųjų 7 d."</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Išplėstiniai"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Bendrieji"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Darbo profilio pranešimai"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prisitaikantys pranešimai"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptyviųjų pranešimų prioritetas"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Pateikti išskleidžiamajame skydelyje, būsenos juostoje ir užrakinimo ekrane"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Slėpti tylius pranešimus būsenos juostoje"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirksinti šviesa"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pranešimai užrakinimo ekrane"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatumas"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Praleisti užrakinimo ekraną"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pan. atr. pagal veidą funkc., ties. eiti į pask. naud. ekr."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"užrakinimo ekranas, praleisti, apeiti"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Pokalbių pranešimai"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Įspėjamieji pranešimai"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Tylieji pranešimai"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Programos, kurios nesusietos su šia apdorojimo priemone"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Visos programos susietos"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d programa nesusieta</item>
+      <item quantity="few">%d programos nesusietos</item>
+      <item quantity="many">%d programos nesusieta</item>
+      <item quantity="other">%d programų nesusieta</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Susietos programos"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pagalbinės virtualiosios realybės paslaugos"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nėra įdiegtų programų, kurios pateikė užklausą būti vykdomos kaip pagalbinės virtualiosios realybės paslaugos."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leisti „<xliff:g id="SERVICE">%1$s</xliff:g>“ pasiekti virtualiosios realybės paslaugą?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apribojimų</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatoriaus duomenų apskaita gali skirtis nuo įrenginio duomenų apskaitos"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Išskiriami duomenys, kuriuos naudoja operatorių tinklai"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Išskiriami duomenys, kuriuos naudoja operatorių tinklai"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nustatyti duomenų įspėjimą"</string>
     <string name="data_warning" msgid="2925054658166062884">"Duomenų įspėjimas"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Pakeisti tinklo veikimo režimą"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Pageidaujamas tinklo tipas"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatorius"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Nustatymų versija"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Skambinama"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operatoriaus vaizdo skambučiai"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemos pasirinkimas"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Išimkite SIM kortelę ir vėl įdėkite. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pabandykite vėl įjungti SIM kortelę. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tinklo aktyvinimas"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatoriaus keitimas"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operatorius „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ aktyvus"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Palieskite ir atnaujinkite SIM nustatymus"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Perjungta į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nepasiekiama"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Laikinai nepasiekiama"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nėra SIM kortelės"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nuostatos"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tinklo nuostatos"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Prisijungti prie viešųjų tinklų"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tinklo ryšys, internetas, belaidis ryšys, duomenys, „Wifi“, „Wi-Fi“, „Wi Fi“, mobilusis ryšys, mobilusis, mobiliojo ryšio operatorius, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Žr. lėktuvo režimo tinklus"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Tvarkyti ryšį"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Pasiekiami lėktuvo režimo tinklai"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Norėdami perjungti tinklus, atjunkite eternetą"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Negalima perjungti tinklų prisijungus"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lėktuvo režimo tinklai"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Prisijungta"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Įveskite telefono numerį"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nėra telefono numerio."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Gerai"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Leisti 2G"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b94afbe..1522776 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Palieliniet vai samaziniet tekstu ekrānā."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Samazināt"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Palielināt"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automātiska pagriešana"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automātiskai pagriešanai, pamatojoties uz sejas noteikšanu, tiek izmantota priekšējā kamera, lai noteiktu, vai kāds skatās uz ekrānu un kādā pozīcijā atrodas seja. Tādējādi tiek atvieglota lasīšana, atrodoties guļus pozīcijā. Turklāt attēli netiek ne saglabāti, ne nosūtīti uzņēmumam Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Uzzināt vairāk&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teksta paraugs"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Brīnumainais burvis no Oza zemes"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. nodaļa: Oza zemes brīnumainā Smaragda pilsēta"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Meklēt"</string>
     <string name="display_settings" msgid="7197750639709493852">"Attēls"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automātiska ekrāna pagriešana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Izslēgt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ieslēgt"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ieslēgt (ar sejas noteikšanu)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Iespējot sejas noteikšanu"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Krāsas"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Dabiska"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Paspilgtināta"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Citi lietotāji"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Ierīces atmiņa"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Pārnēsājama krātuve"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Izmantots: <xliff:g id="USED">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"izmantots no <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Neviena lietotne pēdējā laikā nav piekļuvusi atrašanās vietas informācijai"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Augsts akumulatora patēriņš"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Zems akumulatora patēriņš"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi un Bluetooth meklēšana"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi meklēšana"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Ļauj lietotnēm un pakalpojumiem meklēt Wi-Fi tīklus vienmēr, pat ja Wi-Fi ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth meklēšana"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ļauj lietotnēm un pakalpojumiem meklēt tuvumā esošas ierīces vienmēr, pat ja Bluetooth ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Atrašanās vietu pakalpojumi darbam"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Atrašanās vietas laika joslas noteikšana"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Atrašanās vietas laika joslas noteikšana"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Mainīt fonta lielumu"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrāna lasītāji"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio un ekrānā redzamais teksts"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitri"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Attēlojums"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksts un attēlojums"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrāna aptumšošana"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Zila/dzeltena krāsa"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Spilgtuma samazināšana"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Padariet ekrānu tumšāku par tālruņa minimālo spilgtumu."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Padariet ekrānu tumšāku par planšetdatora minimālo spilgtumu."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Padariet savu ekrānu tumšāku ērtākai lasīšanai.&lt;br/&gt;&lt;br/&gt; Tas var būt noderīgi tālāk minētajos gadījumos. &lt;ol&gt; &lt;li&gt; Jūsu tālruņa noklusējuma minimālais spilgtums joprojām ir pārāk gaišs.&lt;/li&gt; &lt;li&gt; Jūs izmantojat tālruni vāja apgaismojuma apstākļos, piemēram, naktī vai tumšā telpā pirms gulētiešanas.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zvana signāli"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Citas skaņas un vibrācija"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Paziņojumi"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Saruna"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nesen nosūtīti"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Skatīt visas pēdējo 7 dienu laikā instalētās"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Papildu"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Vispārīgi"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Darba paziņojumi"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptīvie paziņojumi"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptīvo paziņojumu prioritāte"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Rādīt nolaižamajā panelī, statusa joslā un bloķēšanas ekrānā"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Paslēpt klusos paziņojumus statusa joslā"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirgojošs gaismas signāls"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Paziņojumi bloķēšanas ekrānā"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Konfidencialitāte"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Izlaist bloķēšanas ekrānu"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Kad veikta autorizācija pēc sejas, atvērt iepriekšējo ekrānu"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloķēšanas ekrāns, izlaist, apiet"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Paziņojumi par sarunām"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Paziņojumi ar skaņu vai vibrāciju"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Klusie paziņojumi"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Lietotnes, kas nav pievienotas šim uztvērējam"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Visas lietotnes ir pievienotas"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="zero">%d lietotnes nav pievienotas</item>
+      <item quantity="one">%d lietotne nav pievienota</item>
+      <item quantity="other">%d lietotnes nav pievienotas</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Pievienotās lietotnes"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR palīga pakalpojumi"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nevienai instalētajai lietotnei nav pieprasīta palaišana kā VR palīga pakalpojumam."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vai atļaut VR pakalpojumam piekļūt pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ierobežojumi</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Neietver datu lietojumu, ko nodrošina mobilo sakaru operatoru tīkli."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Neietver datu lietojumu mobilo sakaru operatoru tīklos."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ieslēgt brīdinājumu par datiem"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datu brīdinājums"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Mainiet tīkla darbības režīmu"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ieteicamais tīkla veids"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilo sakaru operators"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Iestatījumu versija"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Zvanīšana"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Mobilo sakaru operatora videozvani"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistēmas atlasīšana"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izņemiet un atkal ievietojiet SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Mēģiniet atkal ieslēgt SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tīkla aktivizācija"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mobilo sakaru operatora pārslēgšana"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ir aktīvs"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Pieskarieties, lai atjauninātu SIM kartes iestatījumus."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Pārslēgts uz: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nav pieejami"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Īslaicīgi nav pieejams"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nav SIM kartes"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tīkla preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Izveidot savienojumu ar publiskiem tīkliem"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tīkla savienojums, internets, bezvadu, dati, Wi-Fi, mobilais tīkls, mobilie sakari, mobilo sakaru operators, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Skatīt lidojuma režīmā pieejamos tīklus"</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Novērst problēmu ar savienojamību"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lidojuma režīmā pieejamie tīkli"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Lai pārslēgtu tīklus, atvienojiet tīkla Ethernet vadu."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nevar mainīt tīklu, kamēr savienojums ir aktīvs"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lidojuma režīmā pieejamie tīkli"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ir izveidots savienojums"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ievadiet tālruņa numuru"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nav norādīts tālruņa numurs."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Labi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G atļaušana"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d6cd8d8..322939c 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Намалете го или зголемете го текстот на екранот."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Намали"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Зголеми"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Користи автоматско ротирање"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Автоматското ротирање според лице ја користи предната камера за да види дали и како некој го гледа екранот. Тоа овозможува читање во лежечка положба, а сликите никогаш не се складираат или испраќаат во Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Дознајте повеќе&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Примерок на текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чудесниот волшебник од Оз"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Поглавје 11: Чудесниот смарагден град Оз"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пребарај"</string>
     <string name="display_settings" msgid="7197750639709493852">"Приказ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автоматско ротирање на екранот"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Исклучено"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Вклучено"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Вклучено - според лице"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Овозможи откривање лица"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Бои"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природно"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Нагласено"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Други корисници"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Капацитет на уредот"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Пренослива меморија"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> искористено од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Искористено од <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ниедна апликација нема пристапено до локацијата неодамна"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Голема искористеност на бат."</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Мала искористеност на бат."</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Скенирање Wi‑Fi и Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Скенирање на Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволете апликациите и услугите да скенираат Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Скенирање на Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволете апликациите и услугите да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги според локација за работа"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временска зона на локација"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временска зона на локација"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Уредот може да го приспособите да одговара на вашите потреби. Овие функции за пристапност може да ги смените подоцна во Поставки."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Променете ја големината на фонтот"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи на екран"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и текст на екранот"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Титлови"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и екран"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемнете го екранот"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвена и зелена"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвена и зелена"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сина и жолта"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Намали ја осветленоста"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Затемнете го екранот повеќе од неговата минимална осветленост"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Затемнете го таблетот повеќе од неговата минимална осветленост"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затемнете го екранот за да ви биде читањето поудобно.&lt;br/&gt;&lt;br/&gt; Ова може да биде корисно кога: &lt;ol&gt; &lt;li&gt; минималната осветленост на телефонот е сепак пресветла&lt;/li&gt; &lt;li&gt; го користите телефонот во темни ситуации, како на пример, навечер или во темна соба пред легнување&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звуци и вибрации"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Известувања"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговор"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Неодамна испратени"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Преглед на сите од минатите 7 дена"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Напредни"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Општи"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Известувања за работен профил"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Приспособливи известувања"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет на приспособливи известувања"</string>
@@ -3566,9 +3576,9 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Прикажи во списокот со известувања и на заклучен екран"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Прикажи во списокот со известувања и на статусната лента"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи во списокот со известувања, на статусната лента и на заклучен екран"</string>
-    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сокриј тивки известувања во статусната лента"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сокриј бесчујни известувања во статусната лента"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Трепкај со сијаличката"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Известувања на заклучен екран"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Приватност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескокнување заклучен екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Кога ќе се отклучи со лик, оди на последниот користен екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заклучен екран, прескокни, заобиколи"</string>
@@ -3679,14 +3689,14 @@
     <string name="notif_type_ongoing" msgid="2295338067608686711">"Важни тековни известувања"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Известувања за разговор"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Известувања за предупредување"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Тивки известувања"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_silent" msgid="2514763073653979199">"Бесчујни известувања"</string>
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Апликации што не се поврзани за слушателот"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Сите апликации се поврзани"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d апликација не е поврзана</item>
+      <item quantity="other">%d апликации не се поврзани</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Поврзани апликации"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR помошни услуги"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниедна инсталирана апликација не побара да се извршува како VR помошните услуги."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дозволете пристап до VR услугата за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничувања</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Пресметаниот сообраќај на операторот може да се разликува од пресметаниот сообраќај на вашиот уред"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Го исклучува сообраќајот што се користи во мрежите на операторот"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Го исклучува сообраќајот што се користи во мрежите на операторот"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Извести за потрошен интернет"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупредување за интернет"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Променете го режимот на работа на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Претпочитан тип мрежа"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Верзија на „Поставки“"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Повикување"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеоповици преку оператор"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избирање систем"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извадете и повторно вметнете ја SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Обидете се повторно да ја вклучите SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активирање на мрежата"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Префрлање оператор"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активен"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Допрете за да ги ажурирате поставките на SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Се префрливте на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недостапно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено недостапен"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Поставки"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Поставки за мрежа"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Поврзувајте се на јавни мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна врска, интернет, безжичен, мобилен, Wi-Fi, мобилна, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи ги мрежите во авионски режим"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Поправи ја поврзливоста"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Достапни се мрежи во авионски режим"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За промена на мрежата, прекинете ја врската со етернетот"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се промени мрежата додека е поврзано"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за користење во авионски режим"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Поврзано"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Внесете телефонски број"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефонскиот број недостасува."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Во ред"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволете 2G"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7f05490..fa6d350 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"സ്ക്രീനിലെ ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ചെറുതാക്കുക"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"വലുതാക്കുക"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"സ്വയമേ തിരിയൽ ഉപയോഗിക്കുക"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ആരെങ്കിലും സ്‌ക്രീനിൽ നോക്കുന്നുണ്ടോ എന്നും എങ്ങനെയാണ് അവർ സ്‌ക്രീനിൽ നോക്കുന്നത് എന്നും കാണാൻ, മുഖം അടിസ്ഥാനമാക്കിയുള്ള സ്വയമേവ തിരിയൽ, മുന്നിലെ ക്യാമറ ഉപയോഗിക്കുന്നു. കിടക്കുമ്പോൾ വായിക്കാനുള്ള സൗകര്യം അത് നൽകുന്നു കൂടാതെ, ചിത്രങ്ങൾ ഒരിക്കലും Google-ൽ സംഭരിക്കുകയോ Google-ലേക്ക് അയയ്‌ക്കുകയോ ചെയ്യില്ല.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"സാമ്പിൾ ടെക്‌സ്റ്റ്"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ഓസ് നഗരത്തിലെ അതിശയിപ്പിക്കുന്ന മന്ത്രവാദി"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"അധ്യായം 11: ഓസ് എന്ന അത്ഭുതകരമായ മരതകനഗരം"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"സ്‌ക്രീൻ സ്വയമേവ തിരിക്കുക"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ഓഫാണ്"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ഓണാണ്"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ഓണാണ് - ഫേസ് ബേസ്‌ഡ്"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"മുഖം തിരിച്ചറിയൽ ഓണാക്കൂ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"നിറങ്ങൾ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"സ്വാഭാവികം"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ബൂസ്‌റ്റ് ചെയ്‌‌തത്"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"മറ്റ് ഉപയോക്താക്കൾ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ഉപകരണ സ്റ്റോറേജ്"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"പോർട്ടബിൾ സ്റ്റോറേജ്"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>-യുടെ <xliff:g id="USED">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>-ൽ ഉപയോഗിച്ചത്"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"സമീപകാലത്ത് ആപ്പുകളൊന്നും ലൊക്കേഷൻ ആക്‌സസ് ചെയ്‌തിട്ടില്ല"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"കുറഞ്ഞ ബാറ്ററി ഉപയോഗം"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"വൈഫൈ സ്‌കാനിംഗും Bluetooth സ്‌കാനിംഗും"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"വൈഫൈ സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"വൈഫൈ ഓഫാണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയത്തും വൈഫൈ നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth ഓഫ് ആണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയവും അടുത്തുള്ള ഉപകരണം സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ജോലിക്കുള്ള ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ഫോണ്ട് വലുപ്പം മാറ്റുക"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"അടിക്കുറിപ്പുകൾ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ഓഡിയോ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ഡി‌സ്‌പ്ലേ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ടെക്‌സ്‌റ്റും ഡിസ്‌പ്ലേയും"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"സ്ക്രീൻ കൂടുതൽ ഇരുണ്ടതാക്കുക"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"നീല-മഞ്ഞ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"തെളിച്ചം കുറയ്ക്കുക"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"നിങ്ങളുടെ ഫോൺ സ്ക്രീനിനെ, അതിന്റെ ഏറ്റവും കുറഞ്ഞ തെളിച്ചത്തെക്കാൾ ഇരുണ്ടതാക്കുക"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്ക്രീനിനെ, അതിന്റെ ഏറ്റവും കുറഞ്ഞ തെളിച്ചത്തേക്കാൾ ഇരുണ്ടതാക്കുക"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"വായനാസുഖത്തിന് നിങ്ങളുടെ സ്ക്രീൻ കൂടുതൽ ഇരുണ്ടതാക്കുക.&lt;br/&gt;&lt;br/&gt; ഇനിപ്പറയുന്ന സന്ദർഭങ്ങളിൽ ഇത് ഉപയോഗപ്രദമാകും: &lt;ol&gt; &lt;li&gt; നിങ്ങളുടെ ഫോണിന്റെ ഡിഫോൾട്ട് ആയ ഏറ്റവും കുറഞ്ഞ തെളിച്ചം പോലും കൂടുതലായിരിക്കുമ്പോൾ&lt;/li&gt; &lt;li&gt; ഉറങ്ങുന്നതിന് മുമ്പ്, രാത്രിയിലോ ഇരുട്ടുള്ള മുറിയിലോ പോലെ, ഇരുട്ടുള്ള സന്ദർഭങ്ങളിൽ നിങ്ങൾ ഫോൺ ഉപയോഗിക്കുമ്പോൾ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"റിംഗ്‌ടോണുകൾ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"മറ്റ് ശബ്ദങ്ങളും വൈബ്രേഷനുകളും"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"അറിയിപ്പുകൾ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"സംഭാഷണം"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"അടുത്തിടെ അയച്ചവ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"കഴിഞ്ഞ 7 ദിവസത്തെ എല്ലാം കാണുക"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"വിപുലമായത്"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"പൊതുവായവ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ഔദ്യോഗിക അറിയിപ്പുകൾ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"അനുയോജ്യമായ അറിയിപ്പുകൾ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"അനുയോജ്യമായ അറിയിപ്പുകൾക്കുള്ള മു‌ൻഗണന"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"പുൾ ഡൗൺ ഷെയ്‌ഡിലും സ്‌റ്റാറ്റസ് ബാറിലും ലോക്ക് സ്ക്രീനിലും പ്രദർശിപ്പിക്കുക"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"നിശബ്‌ദ അറിയിപ്പുകൾ സ്‌റ്റാറ്റസ് ബാറിൽ മറയ്ക്കുക"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ലൈറ്റ് മിന്നുക"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ലോക്ക്‌സ്ക്രീനിലെ അറിയിപ്പുകൾ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"സ്വകാര്യത"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ലോക്ക് സ്‌ക്രീൻ ഒഴിവാക്കുക"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന് ശേഷം അവസാനം ഉപയോഗിച്ച സ്‌ക്രീനിലേക്ക് നേരിട്ട് പോവുക"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ലോക്ക് സ്‌ക്രീൻ, ലോക്ക് സ്‌ക്രീൻ, ഒഴിവാക്കുക, മറികടക്കുക"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"സംഭാഷണ അറിയിപ്പുകൾ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"മുന്നറിയിപ്പ് നൽകുന്ന അറിയിപ്പുകൾ"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"നിശബ്‌ദ അറിയിപ്പുകൾ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ഈ ലിസണറുമായി ബ്രിഡ്‌ജ് ചെയ്തിട്ടില്ലാത്ത ആപ്പുകൾ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"എല്ലാ ആപ്പുകളും ബ്രിഡ്‌ജ് ചെയ്‌തിരിക്കുന്നു"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d ആപ്പുകൾ ബ്രിഡ്‌ജ് ചെയ്‌തിട്ടില്ല</item>
+      <item quantity="one">%d ആപ്പ് ബ്രിഡ്‌ജ് ചെയ്‌തിട്ടില്ല</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ബ്രിഡ്‌ജ് ചെയ്‌ത ആപ്പുകൾ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR സഹായി സേവനങ്ങൾ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR സഹായി സേവനമായി റൺ ചെയ്യുന്നതിന് ഇൻസ്റ്റാൾ ചെയ്തിട്ടുള്ള ആപ്‌സൊന്നും അഭ്യർത്ഥിച്ചിട്ടില്ല."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്ന സേവനത്തിന് VR സേവന ആക്‌സസ് അനുവദിക്കണോ?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">ഒരു നിയന്ത്രണം</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദാതാക്കള്‍ കണക്കാക്കുന്നത്"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"കാരിയർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുന്ന ഡാറ്റ ഒഴികെയുള്ളവ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"കാരിയർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുന്ന ഡാറ്റ ഒഴികെയുള്ളവ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ഡാറ്റാ മുന്നറിയിപ്പ് സജ്ജീകരിക്കുക"</string>
     <string name="data_warning" msgid="2925054658166062884">"ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"നെറ്റ്‌വർക്ക് പ്രവർത്തിക്കുന്ന മോഡ് മാറ്റുക"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് തരം"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"കാരിയര്‍"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ക്രമീകരണ പതിപ്പ്"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"കോൾചെയ്യുന്നു"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"കാരിയർ വീഡിയോ കോളിംഗ്"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"സിസ്‌റ്റം സെലക്‌ട്"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM നീക്കം ചെയ്‌ത് വീണ്ടും ഇടുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM വീണ്ടും ഓണാക്കാൻ ശ്രമിക്കുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"നെറ്റ്‌വർക്ക് സജീവമാക്കൽ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"കാരിയർ മാറുന്നു"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> സജീവമാണ്"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"സിം ക്രമീകരണം അപ്ഡേറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറി"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ലഭ്യമല്ല"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"താൽക്കാലികമായി ലഭ്യമല്ല"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"സിം ഇല്ല"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"മുൻഗണനകൾ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"നെറ്റ്‌വർക്ക് മുൻഗണനകൾ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"പൊതു നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"നെറ്റ്‌വർക്ക് കണക്ഷൻ, ഇന്‍റര്‍നെറ്റ്, വയർലെസ്, ഡാറ്റ, വൈഫൈ, വൈഫൈ, വൈഫൈ, സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‍‌വർക്കുകൾ കാണുക"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"കണക്റ്റിവിറ്റി ശരിയാക്കുക"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‌വർക്കുകൾ ലഭ്യമാണ്"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"മറ്റ് നെറ്റ്‌വർക്കുകളിലേക്ക് മാറാൻ, ഇതർനെറ്റ് വിച്ഛേദിക്കുക"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"കണക്റ്റ് ചെയ്‌തിരിക്കുമ്പോൾ നെറ്റ്‌വർക്കുകൾ പരസ്പരം മാറാനാകില്ല"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‍വർക്കുകൾ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"കണക്റ്റ് ചെയ്തു"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ഫോൺ നമ്പർ നൽകുക"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ഫോൺ നമ്പർ കാണുന്നില്ല."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ശരി"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G അനുവദിക്കുക"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 0382859..528f7d9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Бусад хэрэглэгчид"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Төхөөрөмжийн хадгалах сан"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Зөөврийн санах ой"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>-ын <xliff:g id="USED">%1$s</xliff:g>-г ашигласан"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>-с ашигласан"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Байршилд саяхан хандсан апп алга"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Батерейны зарцуулалт өндөр"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батерейны зарцуулалт бага"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi болон Bluetooth-н скан"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi скан"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Апп, үйлчилгээнд Wi‑Fi унтраалттай үед ч Wi‑Fi сүлжээг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скан"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Апп, үйлчилгээнд Bluetooth унтраалттай үед ч ойролцоох төхөөрөмжийг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ажилд зориулсан байршлын үйлчилгээ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Байршлын цагийн бүс илрүүлэх горим"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Байршлын цагийн бүс илрүүлэх горим"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Дэлгэц уншигч"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио &amp; дэлгэцийн текст"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Тайлбар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Дэлгэц"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст болон дэлгэц"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Дэлгэцийг бараан болгох"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Цэнхэр-шар"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Гэрэлтүүлгийг багасгах"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Дэлгэцийг таны утасны хамгийн бага гэрэлтүүлгээс бараан болгох"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Дэлгэцийг таны таблетын хамгийн бага гэрэлтүүлгээс бараан болгох"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Дэлгэцээ бараан болгож, уншихад илүү тухтай болгоорой.&lt;br/&gt;&lt;br/&gt; Энэ нь дараах тохиолдолд хэрэгтэй байж болно: &lt;ol&gt; &lt;li&gt; Таны утасны өгөгдмөл хамгийн бага гэрэлтүүлэг хэт тод хэвээр байх үед&lt;/li&gt; &lt;li&gt; Та шөнө, эсвэл орондоо орохоосоо өмнө харанхуй өрөөнд байх зэргээр харанхуй нөхцөл байдалд утсаа ашиглаж байгаа үед&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Хонхны ая"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Бусад ая, чичиргээ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Мэдэгдэл"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Харилцан яриа"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Саяхан илгээсэн"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Сүүлийн 7 хоногийн бүх aппыг харах"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Нарийвчилсан"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ерөнхий"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ажлын мэдэгдэл"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Орчинтой тохирсон мэдэгдлүүд"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Орчинтой тохирсон мэдэгдлийн давуу эрх"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Доош татдаг сүүдэр, статусын хэсэг болон түгжигдсэн дэлгэцэд харагдана."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Статус самбарын чимээгүй мэдэгдлийг нуух"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Анивчих гэрэл"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Түгжсэн дэлгэц дээрх мэдэгдэл"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Нууцлал"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Түгжигдсэн дэлгэцийг алгасах"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Царайгаар тайлсны дараа хамгийн сүүлд ашигласан дэлгэц рүү шууд очно уу"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Түгжигдсэн дэлгэц, Түгжигдсэн дэлгэц, Алгасах, Тойрох"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Харилцан ярианы мэдэгдэл"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Сэрэмжлүүлэх мэдэгдэл"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Чимээгүй мэдэгдэл"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Энэ сонсогчийн гүүргүй аппууд"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Бүх апп гүүртэй байна"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d апп гүүргүй байна</item>
+      <item quantity="one">%d апп гүүргүй байна</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Гүүртэй аппууд"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR туслагч үйлчилгээ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Суулгасан апп-с VR туслагч үйлчилгээгээр ажиллах хүсэлт гаргаагүй байна."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR үйлчилгээг <xliff:g id="SERVICE">%1$s</xliff:g>-д хандахыг зөвшөөрөх үү?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 хязгаарлалт</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байж болно"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор компанийн сүлжээгээр ашигласан өгөгдлийг оруулдаггүй"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Оператор компанийн сүлжээгээр ашигласан өгөгдлийг оруулдаггүй"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ашигласан"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Датаны сануулгыг тохируулах"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дата хэрэглээний сануулга"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Сүлжээний ажиллах горимыг өөрчлөх"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Давуу эрхтэй сүлжээний төрөл"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор компани"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Тохиргооны хувилбар"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Дуудлага"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Оператор компанийн видео дуудлага"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Систем сонгох"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-г салгаад, дахин хийнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-г дахин асааж үзнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Сүлжээг идэвхжүүлэх"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Оператор компанийг сэлгэх"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> идэвхтэй байна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM-н тохиргоог шинэчлэхийн тулд товшино уу"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэсэн"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"боломжгүй"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Түр хугацаанд боломжгүй"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM байхгүй"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Сонголт"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Сүлжээний тохиргоо"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Олон нийтийн Wi-Fi сүлжээнд холбогдох"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сүлжээний холболт, интернэт, утасгүй интернэт, дата, wifi, wi-fi, wi fi, үүрэн холбоо, мобайл, үүрэн холбооны оператор, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Нислэгийн горимын сүлжээг харах"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Холболтыг засах"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Нислэгийн горимын сүлжээ боломжтой"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Сүлжээг сэлгэхийн тулд этернэтийг салгана уу"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Холбогдсон үед сүлжээ сэлгэх боломжгүй"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Нислэгийн горимын сүлжээ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Холбогдсон"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Утасны дугаар оруулна уу"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Утасны дугаар дутуу байна."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G-г зөвшөөрөх"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1c2f039..d3ac721 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रीन वरील मजकूर आणखी लहान किंवा आणखी मोठा करा."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"आणखी लहान करा"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"आणखी मोठे करा"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ऑटो-रोटेट वापरा"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"स्क्रीनकडे कोणी पाहत आहे का आणि कसे पाहत आहे हे जाणून घेण्यासाठी चेहऱ्यावर आधारित ऑटोरोटेट हे समोरचा कॅमेरा वापरते. हे आडवे पडून वाचण्याची परवानगी देते आणि इमेज कधीही स्टोअर केल्या जात नाहीत किंवा Google ला पाठवल्या जात नाहीत.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;अधिक जाणून घ्या&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमुना मजकूर"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz चा अद्भूत जादूगार"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"अध्याय 11: Oz चे अद्भूत पाचूंचे शहर"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"डिस्प्ले"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ऑटो-रोटेट स्क्रीन"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"बंद"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"सुरू"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"सुरू - चेहऱ्यावर आधारित"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"फेस डिटेक्शन सुरू करा"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"नैसर्गिक"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बूस्ट केलेला"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"इतर वापरकर्ते"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"डिव्हाइस स्टोरेज"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल संचयन"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> पैकी <xliff:g id="USED">%1$s</xliff:g> वापरले"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
@@ -1740,11 +1744,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"अलीकडे अ‍ॅक्सेस केलेल्या अ‍ॅप्सचे स्थान नाही"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"उच्च बॅटरी वापर"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"अल्प बॅटरी वापर"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"वाय-फाय आणि ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"वाय-फाय स्कॅनिंग"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"वाय-फाय बंद असले तरीही अ‍ॅप्स आणि सेवांना वाय-फाय नेटवर्क कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारणे अशा कामांसाठी केला जाऊ शकतो."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानाचे टाइमझोन डिटेक्शन"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानाचे टाइमझोन डिटेक्शन"</string>
@@ -2145,7 +2150,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही अ‍ॅक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन वाचक"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"कॅप्शन"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ऑडिओ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"डिस्प्ले"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"मजकूर आणि डिस्प्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन आणखी गडद करा"</string>
@@ -2298,7 +2306,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निळा-पिवळा"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ब्राइटनेस कमी करा"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"स्क्रीन तुमच्या फोनच्या किमान ब्राइटनेसपेक्षा अधिक गडद करा"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"स्क्रीन तुमच्या टॅबलेटच्या किमान ब्राइटनेसपेक्षा अधिक गडद करा"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"वाचण्यासाठी अधिक सुलभ होण्याकरिता तुमची स्क्रीन आणखी गडद करा.&lt;br/&gt;&lt;br/&gt; याची तुम्हाला पुढील परिस्थितींमध्ये मदत होऊ शकते: &lt;ol&gt; &lt;li&gt; तुमच्या फोनचा किमान ब्राइटनेस अजूनही खूप ब्राइट आहे&lt;/li&gt; &lt;li&gt; तुम्ही तुमचा फोन अंधार असलेल्या परिस्थितीमध्ये वापरत आहात, जसे की रात्री किंवा झोपण्याआधी अंधार असलेली खोली&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3505,9 +3514,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"इतर आवाज आणि कंपने"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचना"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"संभाषण"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"नुकतेच पाठवलेले"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"गेल्या ७ दिवसांपासूनचे सर्व पाहा"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"प्रगत"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"साधारण"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"कार्य सूचना"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"अ‍ॅडॅप्टिव्ह सूचना"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"अ‍ॅडाप्टिव्ह सूचना प्राधान्य"</string>
@@ -3569,7 +3579,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पूल-डाउन शेडमध्ये, स्टेटस बारमध्ये आणि लॉक स्क्रीनवर दाखवा"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"स्टेटस बारमधील सायलंट सूचना लपवा"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लॉकस्क्रीनवरील सूचना"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"गोपनीयता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन वगळा"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"फेस अनलॉक नंतर, थेट शेवटच्या वापरलेल्या स्क्रीनवर जा"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, वगळा, बायपास"</string>
@@ -3681,13 +3691,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"संभाषणाशी संबंधित सूचना"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"इशारा देणाऱ्या सूचना"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"सायलंट सूचना"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"या श्रोत्याशी ब्रिज न केलेली ॲप्स"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"सर्व ॲप्स ब्रिज केलेली आहेत"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d ॲप्स ब्रिज केलेली नाहीत</item>
+      <item quantity="one">%d ॲप ब्रिज केलेले नाही</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ब्रिज केलेली ॲप्स"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR मदतकर्ता सेवा"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कोणत्याही इंस्टॉल ॲप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
@@ -4349,7 +4359,7 @@
       <item quantity="one">1 निर्बंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहक डेटा गणना तुमच्या डिव्हाइसपेक्षा भिन्न असू शकते"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"वाहकाच्या नेटवर्कद्वारे वापरलेल्या डेटाचा समावेश करत नाही"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"वाहक नेटवर्कनी वापरलेला डेटा वगळते"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावणी सेट करा"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावणी"</string>
@@ -4893,7 +4903,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क कार्य करण्‍याचा मोड बदला"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"प्राधान्‍यकृत नेटवर्क प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"वाहक"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिंग्जची आवृत्ती"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"कॉलिंग"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"वाहक व्हिडिओ कॉलिंग"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"सिस्टम निवडा"</string>
@@ -4942,6 +4953,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम पुन्हा सुरू करून पाहा. समस्या सुरू राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क अ‍ॅक्टिव्हेशन"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"वाहक स्विच करणे"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अ‍ॅक्टिव्ह आहे"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिमची सेटिंग्ज अपडेट करण्यासाठी टॅप करा"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच केले"</string>
@@ -5037,7 +5049,7 @@
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तुमचा वाहक वाय-फाय कॉलिंगवर आणीबाणी कॉल करण्यासाठी सपोर्ट करत नाही.\nतुमचे डिव्हाइस आणीबाणी कॉल करण्यासाठी सेल्युलर नेटवर्कवर आपोआप स्विच होते.\n फक्त सेल्युलर नेटवर्कच्या परिसरात आणीबाणी कॉल करता येतात."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कॉलची गुणवत्ता वाढवण्यासाठी वाय-फाय वापरा"</string>
     <string name="backup_calling_settings_title" msgid="519714752900364326">"बॅकअप कॉलिंग"</string>
-    <string name="backup_calling_setting_summary" msgid="599493254305348733">"<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> उपलब्ध नसल्यास किंवा रोमिंग असल्यास, <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> कॉलसाठी तुमचे मोबाइल डेटा सिम वापरा."</string>
+    <string name="backup_calling_setting_summary" msgid="599493254305348733">"<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> उपलब्ध नसल्यास किंवा रोमिंगमध्ये असल्यास, <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> कॉलसाठी तुमचे मोबाइल डेटा सिम वापरा."</string>
     <string name="keywords_backup_calling" msgid="8592800915478816800">"बॅकअप कॉलिंग"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"येणारा MMS मेसेज"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS मेसेज पाठवू शकत नाही"</string>
@@ -5117,7 +5129,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नाही"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"तात्पुरते उपलब्ध नाही"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"सिम नाही"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राधान्ये"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क प्राधान्ये"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"विमान मोड नेटवर्क पहा"</string>
@@ -5131,7 +5143,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिव्हिटीसंबंधित समस्यांचे निराकरण करा"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"विमान मोडमध्ये नेटवर्क उपलब्ध आहेत"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क स्विच करण्यासाठी, इथरनेट केबल डिस्कनेक्ट करा"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"कनेक्ट केलेले असताना नेटवर्क स्विच करू शकत नाही"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"विमान मोड नेटवर्क"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट केले आहे"</string>
@@ -5166,4 +5177,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नंबर एंटर करा"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नंबर आढळला नाही."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ओके"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ला अनुमती द्या"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7bd2fd6..5837426 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Kecilkan atau besarkan teks pada skrin."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kecilkan"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Besarkan"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gunakan Autoputar"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Autoputar berasaskan wajah menggunakan kamera depan untuk melihat sama ada dan cara seseorang sedang memandang skrin atau tidak. Ciri ini membolehkan membaca sambil berbaring dan imej tidak akan disimpan atau dihantar kepada Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ketahui lebih lanjut&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teks contoh"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ahli Sihir Oz yang Menakjubkan"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Bab 11: Oz, Kota Zamrud yang Menakjubkan"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Carian"</string>
     <string name="display_settings" msgid="7197750639709493852">"Paparan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Autoputar skrin"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Mati"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Hidup"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Di - Berasaskan wajah"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Dayakan Pengesanan Wajah"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Asli"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ditingkatkan"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Pengguna lain"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Storan peranti"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Storan mudah alih"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> digunakan daripada <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Digunakan daripada <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Tiada apl yang mengakses lokasi baru-baru ini"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Penggunaan bateri tinggi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Penggunaan bateri rendah"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pengimbasan Wi‑Fi dan Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pengimbasan Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan rangkaian Wi-Fi pada bila-bila masa, meskipun apabila Wi-Fi dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pengimbasan Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan peranti berdekatan pada bila-bila masa, meskipun apabila Bluetooth dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Perkhidmatan lokasi untuk kerja"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pengesanan zon waktu lokasi"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pengesanan zon waktu lokasi"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Tukar saiz fon"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca skrin"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks pada skrin"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sari kata"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Paparan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks dan paparan"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Jadikan skrin lebih gelap"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-Kuning"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Kurangkan Kecerahan"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Jadikan skrin lebih gelap daripada kecerahan minimum telefon anda"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Jadikan skrin lebih gelap daripada kecerahan minimum tablet anda"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Jadikan skrin anda lebih gelap supaya lebih selesa untuk dibaca.&lt;br/&gt;&lt;br/&gt; Tindakan ini dapat membantu ketika: &lt;ol&gt; &lt;li&gt; Kecerahan minimum lalai telefon anda masih terlalu terang&lt;/li&gt; &lt;li&gt; Anda menggunakan telefon anda dalam keadaan gelap, seperti pada waktu malam atau di bilik gelap sebelum tidur&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Bunyi dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Pemberitahuan"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Perbualan"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Terbaharu dihantar"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Lihat semua daripada 7 hari yang lalu"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Terperinci"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umum"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pemberitahuan kerja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Pemberitahuan boleh suai"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Keutamaan pemberitahuan mudah suai"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Paparkan dalam bidai tarik turun, bar status &amp; pada skrin kunci"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sembunyikan pemberitahuan senyap dalam bar status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lampu berkelip"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pemberitahuan pada skrin kunci"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privasi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Langkau skrin kunci"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Selepas wajah buka kunci, teruskan ke skrin terakhir digunakan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrin kunci, Langkau, Pintas"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Pemberitahuan perbualan"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Pemberitahuan makluman"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Pemberitahuan senyap"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apl yang tidak dihubungkan kepada pendengar ini"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Semua apl dihubungkan"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d apl tidak dihubungkan</item>
+      <item quantity="one">%d apl tidak dihubungkan</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Apl yang dihubungkan"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Perkhidmatan pembantu VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tiada apl terpasang yang telah meminta untuk dijalankan sebagai perkhidmatan pembantu VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Benarkan akses perkhidmatan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 sekatan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cara pengiraan data pembawa mungkin berbeza daripada pengiraan peranti"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Kecualikan data yang digunakan oleh rangkaian pembawa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Kecualikan data yang digunakan oleh rangkaian pembawa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Tetapkan amaran data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Amaran data"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Tukar mod pengendalian rangkaian"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Jenis rangkaian pilihan"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Pembawa"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versi tetapan"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Memanggil"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Panggilan video pembawa"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pilihan sistem"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM dan masukkan kad itu kembali. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Cuba hidupkan SIM sekali lagi. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pengaktifan rangkaian"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Pertukaran pembawa"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketik untuk mengemas kini tetapan SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Bertukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia buat sementara waktu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tiada SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Pilihan"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Pilihan rangkaian"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Sambungkan kepada rangkaian awam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sambungan rangkaian, internet, wayarles, data, wifi, wi-fi, wi fi, selular, mudah alih, pembawa selular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Lihat rangkaian mod pesawat"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Betulkan kesambungan"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Rangkaian mod pesawat tersedia"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk menukar rangkaian, putuskan sambungan ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak boleh menukar rangkaian semasa bersambung"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rangkaian mod pesawat"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Disambungkan"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan nombor Telefon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tiada nombor telefon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Benarkan 2G"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 56cd69c..058f5be 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"မျက်နှာပြင်ပေါ်ရှိ စာလုံးကို ပိုသေးအောင် သို့မဟုတ် ပိုကြီးအောင် လုပ်ပါ။"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ပိုသေးအောင် ပြုလုပ်ပါ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ပိုကြီးအောင် ပြုလုပ်ပါ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"အလိုအလျောက်လှည့်ခြင်းကို အသုံးပြုခြင်း"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"\'မျက်နှာအခြေခံ အလိုအလျောက်လှည့်ခြင်း\' က တစ်စုံတစ်ဦး ဖန်သားပြင်ကို ကြည့်နေခြင်းရှိမရှိ ရှေ့ကင်မရာ အသုံးပြု၍ စစ်ဆေးသည်။ ဤသည်က လဲလျောင်းနေစဉ် စာဖတ်နိုင်ရန် ခွင့်ပြုပေးပြီး ပုံများကို Google တွင် မည်သည့်အခါမှ မသိမ်းပါ (သို့) ၎င်းသို့ မပို့ပါ။&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ပိုမိုလေ့လာရန်&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"နမူနာ စာသား"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz ၏အံ့ဖွယ်ဝိဇ္ဇာ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"အခန်းကြီး ၁၁ − Oz ၏အံ့ဖွယ် မြစိမ်းရောင်မြို့တော်"</string>
@@ -451,9 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
@@ -558,11 +556,11 @@
     <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="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပုံစံ"</string>
-    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပင်နံပါတ်"</string>
-    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + စကားဝှက်"</string>
-    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
-    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝမက်ထရစ် အချက်အလက်များ + ပုံစံ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝမက်ထရစ် အချက်အလက်များ + ပင်နံပါတ်"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝမက်ထရစ် အချက်အလက်များ + စကားဝှက်"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝမက်ထရစ် အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝမက်ထရစ် အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</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>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ရှာဖွေခြင်း"</string>
     <string name="display_settings" msgid="7197750639709493852">"ဖန်သားပြင် ပြသမှု"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ပိတ်ရန်"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ဖွင့်ရန်"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ဖွင့်ရန် - မျက်နှာအခြေခံ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"မျက်နှာကိုမှတ်မိခြင်း ဖွင့်ရန်"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"အရောင်များ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"သဘာဝ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"အရောင်တင်ထားသည်"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"အခြားအသုံးပြုသူများ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"စက်ပစ္စည်းသိုလှောင်မှု"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"သယ်ယူသွားနိုင်သော သိုလှောင်ရုံ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g> အသုံးပြုပြီး၏"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> အား အသုံးပြုပြီး၏"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"မည်သည့်အက်ပ်မျှ တည်နေရာကို လတ်တလော ဝင်သုံးမထားပါ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ဘက်ထရီအသုံးပြုမှုမြင့်သော"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ဘက်ထရီအသုံးပြုမှုနိမ့်သော"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi နှင့် ဘလူးတုသ် ရှာဖွေခြင်း"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi ရှာဖွေခြင်း"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ Wi-Fi ကွန်ရက်များကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ဘလူးတုသ်ရှာဖွေနေသည်"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ဘလူးတုသ်ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"အလုပ်အတွက် တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
@@ -1817,9 +1822,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"မျက်နှာမှတ် သော့ဖွင့်ရန် စကားဝှက်ထည့်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပုံစံသတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပင်နံပါတ်ထည့်ပါ"</string>
-    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝအချက်များသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝအချက်များသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝအချက်များသုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝမက်ထရစ် သုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝမက်ထရစ် သုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝမက်ထရစ် သုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"စကားဝှက် မေ့နေပါလား။"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ပုံစံ မေ့နေပါသလား။"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ပင်နံပါတ် မေ့နေပါသလား။"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"စာလုံးအရွယ်အစားပြောင်းပါ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"စာတန်းများ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"အသံ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ဖန်သားပြင် ပြသမှု"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"စာသားနှင့် ပြကွက်"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ဖန်သားပြင်ကို ပိုမှောင်အောင်လုပ်ခြင်း"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"အပြာ-အဝါ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"တောက်ပမှုကို လျှော့ခြင်း"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ဖန်သားပြင်ကို သင့်ဖုန်း၏ အနိမ့်ဆုံးတောက်ပမှုထက် ပိုမှောင်အောင်လုပ်သည်"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ဖန်သားပြင်ကို သင့်တက်ဘလက်၏ အနိမ့်ဆုံးတောက်ပမှုထက် ပိုမှောင်အောင်လုပ်သည်"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"စာဖတ်ရာတွင် အနေတော်ဖြစ်စေရန် သင့်ဖန်သားပြင်ကို ပိုမှောင်အောင်လုပ်ပါ။&lt;br/&gt;&lt;br/&gt; ၎င်းက အောက်ပါတို့တွင် အသုံးဝင်သည်- &lt;ol&gt; &lt;li&gt; သင့်ဖုန်း၏ မူလ အနိမ့်ဆုံးတောက်ပမှုက အလွန်လင်းနေသောအခါ&lt;/li&gt; &lt;li&gt; ညအချိန် (သို့) မအိပ်မီ အမှောင်ခန်းကဲ့သို့ မှောင်သည့်အခြေအနေမျိုးတွင် ဖုန်းသုံးနေသောအခါ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ဖုန်းမြည်သံများ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"အခြားအသံနှင့် တုန်ခါမှုများ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"အကြောင်းကြားချက်များ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"စကားဝိုင်း"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"လတ်တလော ပို့ထားသည်"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ပြီးခဲ့သည့် ၇ ရက်မှ အရာအားလုံးကို ကြည့်ရန်"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"အဆင့်မြင့်"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"အထွေထွေ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"အလုပ်သတိပေးချက်များ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"အလိုက်သင့် အကြောင်းကြားချက်များ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"အကြောင်းကြားချက် အလိုက်သင့်ဦးစားပေးမှု"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ဆွဲချစာရင်း၊ အခြေအနေပြနေရာနှင့် လော့ခ်ချထားသည့် မျက်နှာပြင်တွင် ပြသပါ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"အခြေအနေပြဘားရှိ အသံတိတ် အကြောင်းကြားချက်ကို ဖျောက်ပါ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ပါ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"လော့ခ်ချထားချိန် အသိပေးချက်"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ကန့်သတ်ဆက်တင်"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"လော့ခ်ချမျက်နှာပြင် ကျော်ရန်"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"မျက်နှာမှတ်သော့ဖွင့်ပြီးပါက နောက်ဆုံးသုံးခဲ့သည့် မျက်နှာပြင်သို့ သွားပါ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"လော့ခ်ချ မျက်နှာပြင်၊ လော့ခ်ချမျက်နှာပြင်၊ ကျော်ရန်"</string>
@@ -3675,18 +3685,18 @@
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> အတွက်အကြောင်းကြားချက် အသုံးပြုခွင့်ကို ပိတ်လိုက်လျှင်၊ Do Not Disturb ကိုအသုံးပြုခွင့်လည်း ပိတ်လိုက်ပါမည်။"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ပိတ်ရန်"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"မလုပ်တော့"</string>
-    <string name="notification_listener_type_title" msgid="2791552789364336733">"အကြောင်းကြားချက် အမျိုးအစားများကို ခွင့်ပြုထားသည်"</string>
+    <string name="notification_listener_type_title" msgid="2791552789364336733">"ခွင့်ပြုသည့် အကြောင်းကြားချက်များ"</string>
     <string name="notif_type_ongoing" msgid="2295338067608686711">"အရေးကြီးသည့် လက်ရှိအကြောင်းကြားချက်များ"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"စကားဝိုင်း အကြောင်းကြားချက်များ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"သတိပေးသည့် အကြောင်းကြားချက်များ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"အကြောင်းကြားချက်များကို အသံတိတ်ခြင်း"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_silent" msgid="2514763073653979199">"အသံတိတ် အကြောင်းကြားချက်များ"</string>
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ဤနားဆင်သူသို့ ချိတ်ဆက်မထားသော အက်ပ်များ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"အက်ပ်အားလုံး ချိတ်ဆက်ထားသည်"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">အက်ပ် %d ခုကို ချိတ်ဆက်မထားပါ</item>
+      <item quantity="one">အက်ပ် %d ခုကို ချိတ်ဆက်မထားပါ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ချိတ်ဆက်အက်ပ်များ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR အထောက်အကူပြု ဝန်ဆောင်မှုများ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်ကိုမျှ VR အထောက်အကူပြု ဝန်ဆောင်မှုများအဖြစ် ဖွင့်ရန် မတောင်းဆိုထားပါ။"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> အတွက် VR ဝန်ဆောင်မှု အသုံးပြုခွင့်ပြုမလား။"</string>
@@ -3954,9 +3964,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ လော့ခ်ဖွင့်ပုံစံ တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် လော့ခ်ဖွင့်ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ကန့်သတ်ထားသည်"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">ကန့်သတ်ချက် ၁ ခု</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ဝန်ဆောင်မှုပေးသူ၏ ဒေတာအသုံးပြုမှု တွက်ချက်ခြင်းသည် စက်ပစ္စည်း၏ တွက်ချက်ခြင်းနှင့် ကွဲပြားနိုင်သည်"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ဝန်ဆောင်မှုပေးသူ၏ကွန်ရက်များက အသုံးပြုသော ဒေတာများ မပါဝင်ပါ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ဝန်ဆောင်မှုပေးသူ၏ကွန်ရက်များက အသုံးပြုသော ဒေတာများ မပါဝင်ပါ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> အသုံးပြုထားသည်"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ဒေတာသတိပေးချက် သတ်မှတ်ရန်"</string>
     <string name="data_warning" msgid="2925054658166062884">"ဒေတာသတိပေးချက်"</string>
@@ -4415,7 +4425,7 @@
     <string name="notification_log_details_key" msgid="2690467272328709046">"ကီး"</string>
     <string name="notification_log_details_group" msgid="1765952974599794393">"အုပ်စု"</string>
     <string name="notification_log_details_group_summary" msgid="4364622087007803822">"(အကျဉ်းချုပ်)"</string>
-    <string name="notification_log_details_visibility" msgid="6811292866832243357">"မြင်နိင်စွမ်း"</string>
+    <string name="notification_log_details_visibility" msgid="6811292866832243357">"မြင်နိုင်မှု"</string>
     <string name="notification_log_details_public_version" msgid="3057653571018432759">"အများသုံးဗားရှင်း"</string>
     <string name="notification_log_details_priority" msgid="4772047133062255513">"ဦးစားပေးမှု"</string>
     <string name="notification_log_details_importance" msgid="8516198274667183446">"အရေးပါမှု"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်ကို ပြောင်းပါ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"အသုံးပြုလိုသော ကွန်ရက် အမျိုးအစား"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ဝန်ဆောင်မှုပေးသူ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ဆက်တင်ဗားရှင်း"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"ခေါ်ဆိုနေသည်"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ဝန်ဆောင်မှုပေးသူ ဗီဒီယိုခေါ်ဆိုခြင်း"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"စနစ်ကို ရွေးချယ်ရန်"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ဆင်းမ်ကို ဖယ်ရှားပြီး ပြန်ထည့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ဆင်းမ်ကို ပြန်ဖွင့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ကွန်ရက် စတင်အသုံးပြုခြင်း"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ဝန်ဆောင်မှုပေးသူ ပြောင်းခြင်း"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ကို အသုံးပြုနေသည်"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ဆင်းမ်ကတ်ဆက်တင်များ အပ်ဒိတ်လုပ်ရန် တို့ပါ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းလိုက်သည်"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"မရနိုင်ပါ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ယာယီ မရနိုင်သေးပါ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM မရှိပါ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ရွေးချယ်မှုများ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ကွန်ရက် သတ်မှတ်ချက်များ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"အများသုံးကွန်ရက်များသို့ ချိတ်ဆက်လိုက်သည်"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းဝန်ဆောင်မှုပေးသူ၊ 4g၊ 3g၊ 2g၊ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များကို ပြသရန်"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ပုံသေ ချိတ်ဆက်နိုင်မှု"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ ရရှိနိုင်သည်"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ကွန်ရက်ပြောင်းရန် အီသာနက်ကို ချိတ်ဆက်မှုဖြုတ်ပါ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ချိတ်ဆက်ထားစဉ် ကွန်ရက် မပြောင်းနိုင်ပါ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ချိတ်ဆက်ထားသည်"</string>
@@ -5148,7 +5159,7 @@
     <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက် <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ရောက်လိုသည်။ ၎င်းတွင် အဝင်နှင့် အထွက်ခေါ်ဆိုမှုများဆိုင်ရာ ဒေတာ ပါဝင်သည်။\n\nသင်သည် <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
     <string name="category_name_brightness" msgid="8520372392029305084">"တောက်ပမှု"</string>
     <string name="category_name_lock_display" msgid="7478785189102882266">"လော့ခ်ချထားချိန် ဖန်သားပြင်"</string>
-    <string name="category_name_visibility" msgid="4485030512199246405">"မြင်နိုင်စွမ်း"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"မြင်နိုင်မှု"</string>
     <string name="category_name_color" msgid="937514550918977151">"အရောင်"</string>
     <string name="category_name_others" msgid="2366006298768550310">"အခြား"</string>
     <string name="category_name_general" msgid="7737273712848115886">"အထွေထွေ"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ဖုန်းနံပါတ် ထည့်ပါ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ဖုန်းနံပါတ် မထည့်ရသေးပါ။"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ခွင့်ပြုခြင်း"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a040c28..585523c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gjør teksten på skjermen større eller mindre."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Gjør mindre"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Gjør større"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Bruk automatisk rotasjon"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Ansiktsbasert automatisk rotasjon bruker frontkameraet til å se om og hvordan noen ser på skjermen. Det gjør at du kan lese mens du ligger. Bilder blir aldri lagret eller sendt til Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Finn ut mer&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Eksempeltekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Trollmannen fra Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapittel 11: Den vidunderlige smaragdbyen Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Søk"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotér skjermen automatisk"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Av"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"På"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"På – ansiktsbasert"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Slå på ansiktsgjenkjenning"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlig"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Forsterket"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andre brukere"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagring på enheten"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bærbar lagring"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> brukt av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apper har nylig brukt posisjon"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lav batteribruk"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Søking etter Wi‑Fi og Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-skanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"La apper og tjenester søke etter Wi-Fi-nettverk når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-søking"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Posisjonstjenester for jobb"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Gjenkjenning av tidssone basert på posisjon"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Gjenkjenning av tidssone basert på posisjon"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Endre skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjermlesere"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skjermen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Teksting"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Lyd"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Skjerm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst og skjerm"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gjør skjermen mørkere"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grønn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grønn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduser lysstyrken"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gjør skjermen mørkere enn standard laveste lysstyrke på telefonen"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gjør skjermen mørkere enn standard laveste lysstyrke på nettbrettet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gjør skjermen mørkere, slik at det er mer komfortabelt å lese.&lt;br/&gt;&lt;br/&gt; Dette kan være nyttig når &lt;ol&gt; &lt;li&gt; standard laveste lysstyrke på telefonen fremdeles er for lys&lt;/li&gt; &lt;li&gt; du bruker telefonen i mørke omgivelser, for eksempel om natten eller i et mørkt rom før leggetid&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringelyder"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andre lyder og vibrasjoner"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Varsler"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtale"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nylig sendt"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Se alt fra de siste sju dagene"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avansert"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generelt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Jobbvarsler"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Varsler som kan tilpasses"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Tilpasset varselprioritet"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vis i nedtrekkspanelet, statusfeltet og på låseskjermen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skjul lydløse varsler i statusfeltet"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Varsler på låseskjermen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Personvern"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hopp over låseskjermen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gå direkte til den forrige skjermen etter ansiktsopplåsing"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskjerm, låseskjerm, hopp over, omgå"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalevarsler"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Varsler med varsling"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Lydløse varsler"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apper som ikke er brokoblet til denne lytteren"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alle apper er brokoblet"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d apper er ikke brokoblet</item>
+      <item quantity="one">%d app er ikke brokoblet</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Brokoblede apper"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjelpetjenester for VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen av de installerte appene har bedt om å bli kjørt som hjelpetjeneste for VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillate tjenestetilgang for VR for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 begrensning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ekskluderer data som brukes av operatørnettverk"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ekskluderer data som brukes av operatørnettverk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Angi varsel om databruk"</string>
     <string name="data_warning" msgid="2925054658166062884">"Varsel om databruk"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Bytt nettverksmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Foretrukket nettverkstype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatør"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Innstillingsversjon"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Anrop"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoanrop via mobiloperatør"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemvalg"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjern SIM-kortet og sett det inn igjen. Start enheten på nytt hvis problemet vedvarer."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv å slå på SIM-kortet igjen. Start enheten på nytt hvis problemet vedvarer."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivering av nettverk"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatørbytte"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trykk for å oppdatere SIM-kortinnstillingene"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Byttet til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"utilgjengelig"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidig utilgjengelig"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Uten SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Innstillinger"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nettverksinnstillinger"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koble til offentlige nettverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se nettverk for flymodus"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fiks tilkobling"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nettverk for flymodus er tilgjengelig"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"For å bytte nettverk, koble fra Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke bytte nettverk når du er tilkoblet"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nettverk for flymodus"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tilkoblet"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Skriv inn telefonnummeret"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillat 2G"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index d9e019d..33486e7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रिनमा भएको पाठलाई अझै सानो वा ठुलो बनाउनुहोस्।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"अझ सानो बनाउनुहोस्"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"अझ ठुलो बनाउनुहोस्"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"स्वतः रोटेट हुने सुविधा प्रयोग गर्नुहोस्"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"अनुहारमा आधारित स्वतः रोटेट हुने सुविधाले कुनै व्यक्तिले स्क्रिनमा हेरेका छन् कि छैनन् र हेरेका छन् भने कसरी हेरेका छन् भन्ने कुरा हेर्न अगाडिको क्यामेरा प्रयोग गर्छ। यसले सुतेर पढ्ने अनुमति दिन्छ र फोटोहरू कहिल्यै पनि भण्डारण गरिँदैनन् वा Google मा पठाइँदैनन्।&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमूना पाठ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"दि वन्डरफुल विजार्ड अफ ओज"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"अध्याय ११: दि वन्डरफुल एमरल्ड सिटी अफ ओज"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"खोज्नुहोस्"</string>
     <string name="display_settings" msgid="7197750639709493852">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"स्वतःघुम्ने स्क्रिन"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"अफ छ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"अन छ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"अन छ - अनुहारमा आधारित"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"अनुहार पत्ता लगाउने सुविधा अन गर्नुहोस्"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रङहरू"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"प्राकृतिक"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बुस्ट गरिएको"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"यन्त्र भण्डारण"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल भण्डारण"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> को <xliff:g id="USED">%1$s</xliff:g> प्रयोग भएको"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> को प्रयोग भएको"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"कुनै पनि अनुप्रयोगले हाल स्थानमाथि पहुँच गरेको छैन"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"उच्च ब्याट्री प्रयोग"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"कम ब्याट्री प्रयोग"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi तथा ब्लुटुथ स्क्यान गर्दै"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi स्क्यान गर्दै"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"एप र सेवाहरूलाई जुनसुकै बेला (Wi‑Fi निष्क्रिय भएको बेलामा पनि) वरपरका Wi-Fi नेटवर्कहरू स्क्यान गर्न अनुमति दिनुहोस्। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लुटुथ स्क्यान हुँदै"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका स्थानसम्बन्धी सेवाहरू"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई आफू अनुकूल गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिने छ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फन्ट साइज बदल्नुहोस्"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रिन रिडरहरू"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"क्याप्सनहरू"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"अडियो"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"प्रदर्शन"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"पाठ तथा डिस्प्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रिन अझ अँध्यारो बनाउनुहोस्"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"रातो-हरियो"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"रातो-हरियो"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निलो-पहेँलो"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"स्क्रिनको चमक घटाउनुहोस्"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"आफ्नो फोनको स्क्रिनको चमक घटाएर न्यूनतम चमकभन्दा पनि कम गर्नुहोस्"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"आफ्नो ट्याब्लेटको स्क्रिनको चमक घटाएर न्यूनतम चमकभन्दा पनि कम गर्नुहोस्"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"स्क्रिनमा भएको पाठ पढ्न अझ सजिलो होस् भन्नाका खातिर आफ्नो स्क्रिन अझ अँध्यारो बनाउनुहोस्।&lt;br/&gt;&lt;br/&gt; निम्न अवस्थाहरूमा यसो गर्नु उपयोगी हुन सक्छ: &lt;ol&gt; &lt;li&gt; तपाईंको फोनको स्क्रिनको न्यूनतम पूर्वनिर्धारित चमक अझै पनि धेरै उज्यालो छ&lt;/li&gt; &lt;li&gt; तपाईं आफ्नो फोन राति वा सुत्नुअघि अँध्यारो कोठा जस्ता अँध्यारो ठाउँमा प्रयोग गर्दै हुनुहुन्छ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिङटोनहरू"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ध्वनि र कम्पन सम्बन्धी अन्य कुराहरू"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचनाहरू"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"वार्तालाप"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"हालै पठाइएका एपहरू"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"विगत ७ दिनयताका सबै हेर्नुहोस्"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"उन्‍नत"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"सामान्य"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"कार्यका सूचनाहरू"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"अनुकूल पार्न मिल्ने सूचनाहरू"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"अनुकूल पार्न मिल्ने सूचनाको प्राथमिकता"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पुल डाउन सेड, स्टाटस बार र लक स्क्रिनमा देखाउनुहोस्"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"मौन सूचनाहरूलाई स्टाटस बारमा लुकाउनुहोस्"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"झिम झिम गर्ने बत्ती"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लक स्क्रिनमा देखिने सूचनाहरू"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"गोपनीयता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लक स्क्रिन छाड्नुहोस्"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"फेस अनलक प्रयोग गरी अनलक गरेपछि सीधै पछिल्लो पटक प्रयोग गरिएको स्क्रिनमा जानुहोस्"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लक स्क्रिन, लकस्क्रिन, छाड्नुहोस्, बाइपास गर्नुहोस्"</string>
@@ -3657,7 +3667,7 @@
       <item quantity="one">प्रति हप्ता लगभग <xliff:g id="NUMBER_0">%d</xliff:g> सूचना</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कहिल्यै होइन"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचनासम्बन्धी पहुँच"</string>
+    <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचनामाथिको पहुँच"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"कार्य प्रोफाइलमाथिका पहुँच सम्बन्धी सूचनाहरूलाई बन्द गरिएको छ"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"एपहरूले सूचनाहरू पढ्न सक्दैन"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3667,7 +3677,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"अनुकूल पार्न मिल्ने सूचनाहरू"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"कुनै पनि होइन"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"कुनै स्थापित एपहरूले सूचना पहुँच अनुरोध गरेका छैनन्।"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"सूचनामाथि पहुँच राख्न दिनुहोस्"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"सूचना हेर्नु अनुमति दिनुहोस्"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई सूचनामाथि पहुँच राख्ने अनुमति दिने हो?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका टेक्स्ट म्यासेजहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> का लागि सूचना पहुँच अनुमति दिने हो?"</string>
@@ -3678,15 +3688,15 @@
     <string name="notification_listener_type_title" msgid="2791552789364336733">"अनुमति दिइएका सूचनाका प्रकारहरू"</string>
     <string name="notif_type_ongoing" msgid="2295338067608686711">"सदैव देखाइने महत्त्वपूर्ण सूचनाहरू"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"कुराकानीसम्बन्धी सूचनाहरू"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"कम्पन वा आवाजसहितका सूचनाहरू"</string>
+    <string name="notif_type_alerting" msgid="2300039323822104165">"भाइब्रेसन वा आवाजसहित आउने सूचना आवाजसहितका सूचनाहरू"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"साइलेन्ट सूचनाहरू"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ती एपहरूको सूची जसबाट प्राप्त सूचनाहरू यी प्रयोगकर्ता देख्नुहुन्न"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"सबै एपहरू लिंक गरिएका छन्"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d वटा एपहरू लिंक गरिएका छैनन्</item>
+      <item quantity="one">%d एप लिंक गरिएको छैन</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"लिंक गरिएका एपहरू"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR का सहायक सेवाहरू"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कुनै पनि स्थापित एपहरूले VR का सहायक सेवाहरूको रूपमा चल्नका लागि अनुरोध गरेका छैनन्।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई VR को सेवामा पहुँचका लागि अनुमति दिने हो?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">१ वटा बन्देज</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहकको डेटाको हिसाब-किताब राख्ने कार्य तपाईँको यन्त्रको हिसाब-किताब राख्ने कार्य भन्दा फरक हुन सक्छ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"यस विवरणमा सेवा प्रदायकको नेटवर्कले प्रयोग गरेको डेटा समावेश गरिएको छैन"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"मोबाइल सेवा प्रदायकको नेटवर्कले प्रयोग गरेको डेटा समावेश गरिएको छैन"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटाबारे चेतावनी सेट गर्नुहोस्"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटाबारे चेतावनी"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क अपरेटिङ मोड परिवर्तन गर्नुहोस्"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"रुचाइएको नेटवर्कको प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"सेवा प्रदायक"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिङहरूको संस्करण"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"कल गर्दै"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"सेवा प्रदायकको भिडियो कल"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"प्रणाली चयन गर्नुहोस्"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"फेरि SIM सक्रिय गरी हेर्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क सक्रिय गर्ने प्रक्रिया"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"मोबाइल सेवा प्रदायक परिवर्तन गरिँदै छ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय छ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM का सेटिङ परिवर्तन गर्न ट्याप गर्नुहोस्"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> प्रयोग गर्न थालियो"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध छैन"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"केही समयका लागि अनुपलब्ध छ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM कार्ड छैन"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताहरू"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्कसम्बन्धी प्राथमिकताहरू"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक Wi-Fi नेटवर्कमा कनेक्ट गरियोस्"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्सन, इन्टरनेट, वायरलेस, डेटा, wifi, wi-fi, wi fi, सेलुलर, मोबाइल, सेल सेवा प्रदायक, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"हवाइजहाज मोड अन गरिएका नेटवर्क हेर्नुहोस्"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिभिटीसम्बन्धी समस्या समाधान गर्नुहोस्"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू उपलब्ध छन्"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदल्न इथरनेट डिस्कनेक्ट गर्नुहोस्"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"इथरनेट नेटवर्कमा कनेक्ट भएका बेला नेटवर्क बदल्न सकिँदैन"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"हवाइजहाज मोडमा चल्ने नेटवर्कहरू"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"इन्टरनेटमा कनेक्ट गरिएको छ"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नम्बर हाल्नुहोस्"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नम्बर हालिएको छैन।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठिक छ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G चलाउन दिनुहोस्"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f23f5c5..cf403ff 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Maak de tekst op het scherm kleiner of groter."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Verkleinen"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Vergroten"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automatisch draaien gebruiken"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatisch draaien op basis van gezicht gebruikt de camera aan de voorzijde om te zien of en hoe iemand naar het scherm kijkt. Hierdoor kun je lezen terwijl je ligt. De afbeeldingen worden nooit opgeslagen of naar Google gestuurd.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Meer informatie&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Voorbeeldtekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"De tovenaar van Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Hoofdstuk 11: De prachtige Smaragden Stad van Oz"</string>
@@ -1148,10 +1146,10 @@
     <string name="volume_ring_description" msgid="5423168446359881864">"Ringtone en meldingen"</string>
     <string name="volume_notification_description" msgid="3241009629930030492">"Meldingen"</string>
     <string name="volume_alarm_description" msgid="156563371961039376">"Wekkers"</string>
-    <string name="volume_ring_mute" msgid="1445718401945149622">"Ringtone en meldingen dempen"</string>
-    <string name="volume_media_mute" msgid="1881020121757820746">"Muziek en andere media dempen"</string>
-    <string name="volume_notification_mute" msgid="2612197659377126312">"Meldingen dempen"</string>
-    <string name="volume_alarm_mute" msgid="3730895630530980760">"Wekkers dempen"</string>
+    <string name="volume_ring_mute" msgid="1445718401945149622">"Ringtone- en meldingsgeluid uitzetten"</string>
+    <string name="volume_media_mute" msgid="1881020121757820746">"Muziek- en ander mediageluid uitzetten"</string>
+    <string name="volume_notification_mute" msgid="2612197659377126312">"Meldingsgeluid uitzetten"</string>
+    <string name="volume_alarm_mute" msgid="3730895630530980760">"Wekkergeluid uitzetten"</string>
     <string name="dock_settings" msgid="4654404127402812514">"Docken"</string>
     <string name="dock_settings_title" msgid="1276956575555480214">"Instellingen voor dockstation"</string>
     <string name="dock_audio_settings_title" msgid="8294821925086965934">"Audio"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Zoeken"</string>
     <string name="display_settings" msgid="7197750639709493852">"Scherm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Scherm autom. draaien"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Uit"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aan"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aan: op basis van gezicht"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gezichtsherkenning aanzetten"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kleuren"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natuurlijk"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Versterkt"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andere gebruikers"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Apparaatopslag"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Draagbare opslag"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> gebruikt van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Er zijn geen apps die recent toegang hebben gehad tot je locatie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoog accugebruik"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Laag batterijgebruik"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Scannen via wifi en bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wifi-scannen"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Apps en services toestaan altijd te scannen naar wifi-netwerken in de buurt, zelfs als wifi is uitgeschakeld. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scannen"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps en services toestaan altijd te scannen naar apparaten in de buurt, zelfs als bluetooth is uitgeschakeld. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Locatieservices voor het werk"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Tijdzonedetectie op basis van locatie"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Tijdzonedetectie op basis van locatie"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Schermlezers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio en tekst op het scherm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Ondertiteling"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Scherm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst en weergave"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scherm donkerder maken"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rood-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rood-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blauw-geel"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Helderheid verlagen"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Maak het scherm donkerder dan de minimumhelderheid van je telefoon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Maak het scherm helderder dan de minimumhelderheid van je tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Maak je scherm donkerder zodat je het prettiger kunt lezen.&lt;br/&gt;&lt;br/&gt; Dit kan in de volgende situaties handig zijn: &lt;ol&gt; &lt;li&gt; De standaard minimumhelderheid van je telefoon is te helder voor je.&lt;/li&gt; &lt;li&gt; Je gebruikt je telefoon in een donkere omgeving, zoals \'s avonds laat of in een donkere kamer voordat je gaat slapen.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3297,7 +3306,7 @@
     <string name="keywords_network_reset" msgid="4075670452112218042">"resetten, herstellen, terugzetten naar fabrieksinstellingen"</string>
     <string name="keywords_factory_data_reset" msgid="4979623326958976773">"wissen, verwijderen, legen, herstellen, schoonmaken, fabrieksinstellingen terugzetten"</string>
     <string name="keywords_printing" msgid="3528250034669909466">"printer"</string>
-    <string name="keywords_sounds" msgid="1850691834585575875">"speakerpiep, speaker, luidspreker, volume, dempen, stil, audio, muziek"</string>
+    <string name="keywords_sounds" msgid="1850691834585575875">"speakerpiep, speaker, luidspreker, volume, dempen, geluid uitzetten, stil, audio, muziek"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"niet storen, verstoren, onderbreking, storing"</string>
     <string name="keywords_app" msgid="7983814237980258061">"RAM"</string>
     <string name="keywords_location" msgid="8016374808099706213">"in de buurt, locatie, geschiedenis, rapportage, gps"</string>
@@ -3337,7 +3346,7 @@
     <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"scherm dimmen, slaap, batterij, time-out, aandacht, display, scherm, inactiviteit"</string>
     <string name="keywords_auto_rotate" msgid="7914655570000378975">"roteren, draaien, omdraaien, rotatie, portret, landschap, oriëntatie, verticaal, horizontaal, staand, liggend"</string>
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
-    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schema, meldingen, blokkeren, stil, trillen, slapen, werken, focus, geluid, dempen, dag, weekdag, weekend, doordeweekse avond, evenement, afspraak"</string>
+    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schema, meldingen, blokkeren, stil, trillen, slapen, werken, focus, geluid, dempen, dag, weekdag, weekend, doordeweekse avond, evenement, afspraak, geluid uitzetten, niet storen"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"scherm, vergrendelingstijd, time-out, vergrendelscherm"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"geheugen, cache, gegevens, wissen, verwijderen, vrij, vrijmaken, ruimte"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"verbonden, apparaat, hoofdtelefoon, koptelefoon, headset, speaker, luidspreker, draadloos, koppelen, oordoppen, oordopjes, muziek, media"</string>
@@ -3407,7 +3416,7 @@
     <string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Planningen"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Planning"</string>
     <string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Planning"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoon dempen op bepaalde tijdstippen"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoongeluid uitzetten op bepaalde tijdstippen"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Regels voor \'Niet storen\' instellen"</string>
     <string name="zen_mode_schedule_title" msgid="7064866561892906613">"Planning"</string>
     <string name="zen_mode_use_automatic_rule" msgid="733850322530002484">"Planning gebruiken"</string>
@@ -3432,7 +3441,7 @@
     <string name="zen_mode_what_to_block_title" msgid="5692710098205334164">"Aangepaste beperkingen"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="8780668375194500987">"Wanneer het scherm is ingeschakeld"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="2291988790355612826">"Wanneer het scherm is uitgeschakeld"</string>
-    <string name="zen_mode_block_effect_sound" msgid="7929909410442858327">"Geluid en trillen dempen"</string>
+    <string name="zen_mode_block_effect_sound" msgid="7929909410442858327">"Geluid en trillen uitzetten"</string>
     <string name="zen_mode_block_effect_intent" msgid="7621578645742903531">"Scherm niet inschakelen"</string>
     <string name="zen_mode_block_effect_light" msgid="1997222991427784993">"Lampje niet laten knipperen"</string>
     <string name="zen_mode_block_effect_peek" msgid="2525844009475266022">"Geen meldingen op het scherm"</string>
@@ -3474,14 +3483,14 @@
     <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_duration" msgid="7515850842082631460">"Duur voor \'Snelle instellingen\'"</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_footer" msgid="4090291351903631977">"Als \'Niet storen\' aanstaat, staan geluiden en trillingen uit, behalve als je ze hierboven toestaat."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Aangepaste instellingen"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Planning controleren"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Meldingen"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duur"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Meldingen, afspraken en herinneringen"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en afspraken gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Als \'Niet storen\' aanstaat, wordt het geluid van berichten, herinneringen en afspraken uitgezet, behalve als je ze hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je nog wel kunnen bereiken."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"Klaar"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Instellingen"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Geen zichtbare of hoorbare meldingen"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andere geluiden en trillingen"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Meldingen"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Gesprek"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recent verstuurd"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Alles weergeven van de afgelopen zeven dagen"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Geavanceerd"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Algemeen"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Werkmeldingen"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Aanpasbare meldingen"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Aanpasbare meldingsprioriteit"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Weergeven in pull-downvenster, statusbalk en op vergrendelscherm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Stille meldingen in de statusbalk verbergen"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Knipperlicht"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Meldingen op vergrendelscherm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Vergrendelscherm overslaan"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Na ontgrendelen via gezichtsherkenning rechtstreeks naar laatst gebruikte scherm gaan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Scherm vergrendelen, vergrendelscherm, overslaan"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Gespreksmeldingen"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Meldingen met waarschuwing"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Stille meldingen"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps die niet zijn gekoppeld aan deze listener"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alle apps zijn gekoppeld"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d apps zijn niet gekoppeld</item>
+      <item quantity="one">%d app is niet gekoppeld</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Gekoppelde apps"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperservices"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Er zijn geen geïnstalleerde apps die hebben gevraagd om te worden uitgevoerd als VR-helperservices."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-servicetoegang toestaan voor <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3918,7 +3928,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Wijzigen in \'Alleen wekkers\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Wijzigen in \'Altijd onderbreken\'"</string>
     <string name="zen_mode_screen_on" msgid="7312758100468915319">"Wanneer het scherm is ingeschakeld"</string>
-    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"Meldingen die door \'Niet storen\' zijn gedempt, op het scherm laten weergeven en een icoon in de statusbalk weergeven"</string>
+    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"Meldingen die door \'Niet storen\' geen geluid maken, op het scherm laten weergeven en een icoon in de statusbalk weergeven"</string>
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"Wanneer het scherm is uitgeschakeld"</string>
     <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"Toestaan dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen of het meldingslampje laten knipperen"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"Meldingen die op stil zijn gezet door \'Niet storen\', het scherm laten inschakelen"</string>
@@ -4284,7 +4294,7 @@
     <string name="condition_airplane_title" msgid="5847967403687381705">"Vliegmodus is ingeschakeld"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Netwerken niet beschikbaar"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"\'Niet storen\' is ingeschakeld"</string>
-    <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Telefoon gedempt"</string>
+    <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Telefoongeluid staat uit"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"Met uitzonderingen"</string>
     <string name="condition_battery_title" msgid="6395113995454385248">"Batterijbesparing aan"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Functies zijn beperkt"</string>
@@ -4295,7 +4305,7 @@
     <string name="condition_work_title" msgid="174326145616998813">"Werkprofiel is uitgeschakeld"</string>
     <string name="condition_work_summary" msgid="7113473121312772398">"Voor apps en meldingen"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="4078406807327674934">"Geluid inschakelen"</string>
-    <string name="condition_device_muted_title" msgid="2446306263428466378">"Belsoftware gedempt"</string>
+    <string name="condition_device_muted_title" msgid="2446306263428466378">"Ringtone staat uit"</string>
     <string name="condition_device_muted_summary" msgid="3772178424510397327">"Voor gesprekken en meldingen"</string>
     <string name="condition_device_vibrate_title" msgid="9058943409545158583">"Alleen trillen"</string>
     <string name="condition_device_vibrate_summary" msgid="7537724181691903202">"Voor gesprekken en meldingen"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Het door de provider berekende dataverbruik kan afwijken van de berekening van het apparaat"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit die worden gebruikt door providernetwerken"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sluit data uit die worden gebruikt door providernetwerken"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datawaarschuwing instellen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarschuwing"</string>
@@ -4775,10 +4785,10 @@
     <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"Druk tegelijkertijd op de aan/uit-knop en de knop \'Volume omhoog\' voor"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="4529077822282099235">"Snelkoppeling om ringtone uit te schakelen"</string>
     <string name="prevent_ringing_option_vibrate" msgid="5456962289649581737">"Trillen"</string>
-    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"Dempen"</string>
+    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"Geluid uitzetten"</string>
     <string name="prevent_ringing_option_none" msgid="7776676007180834163">"Niets doen"</string>
     <string name="prevent_ringing_option_vibrate_summary" msgid="3435299885425754304">"Trillen"</string>
-    <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Dempen"</string>
+    <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Geluid uit"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netwerkgegevens"</string>
     <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Je apparaatnaam is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien als je verbinding maakt met bluetooth-apparaten of een wifi-netwerk, of als je een wifi-hotspot instelt."</string>
     <string name="devices_title" msgid="649715719278562515">"Apparaten"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"De netwerkgebruiksmodus wijzigen"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Voorkeursnetwerktype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Provider"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versie van instellingen"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Bellen"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Provider videogesprekken"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systeem selecteren"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwijder de simkaart en plaats deze opnieuw. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer de simkaart weer in te schakelen. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkactivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Wijziging van provider"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is actief"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om de instellingen voor de simkaart te updaten"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Overgeschakeld naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"niet beschikbaar"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tijdelijk niet beschikbaar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen simkaart"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeuren"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeuren"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Verbinden met openbare netwerken"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, mobiel, mobiele provider, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Netwerken voor vliegtuigmodus bekijken"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Connectiviteitsproblemen oplossen"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Netwerken voor vliegtuigmodus beschikbaar"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Verbreek de ethernetverbinding om van netwerk te wisselen"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan niet van netwerk wisselen als er verbinding is"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netwerken voor vliegtuigmodus"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbonden"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefoonnummer opgeven"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoonnummer ontbreekt."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G toestaan"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index aad31cb..3a70f71 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ପୋର୍ଟେବଲ୍‌ ଷ୍ଟୋରେଜ୍‌"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ର <xliff:g id="USED">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>ର ବ୍ୟବହୃତ"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ସମ୍ପ୍ରତ୍ତି କୌଣସି ଆପ୍ ଲୋକେସନ୍ ଆକ୍ସେସ୍ କରିନାହିଁ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ବ୍ୟାଟେରୀର ଅଧିକ ବ୍ୟବହାର"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ନିମ୍ନ ବ୍ୟାଟେରୀ ବ୍ୟବହାର"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ୍‌ ସ୍କାନିଂ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ୱାଇ-ଫାଇ ସ୍କାନିଂ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟ୍‌ୱାର୍କ ପାଇଁ ସ୍କାନ୍ କରିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ୱାଇ-ଫାଇ ବନ୍ଦ‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ବ୍ଲୁଟୁଥ ସ୍କାନିଂ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ ଖୋଜିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ବ୍ଲୁଟୂଥ୍‍‌ ଅଫ୍‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"କାର୍ଯ୍ୟ ପାଇଁ ଲୋକେସନ୍ ସମ୍ପର୍କିତ ସେବା"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ନିଜର ଆବଶ୍ୟକତା ଅନୁସାରେ ଏହି ଡିଭାଇସ୍‌କୁ ଆପଣ କଷ୍ଟମାଇଜ୍‌ କରିପାରିବେ। ଏହି ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ପରେ ସେଟିଂସରେ ବଦଳା ଯାଇପାରିବ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ଫଣ୍ଟ ସାଇଜ୍ ବଦଳାନ୍ତୁ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ସ୍କ୍ରିନ୍‌ ରିଡର୍"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ଅଡିଓ ଓ ଅନ୍-ସ୍କ୍ରିନ୍ ଟେକ୍ସଟ୍"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"କ୍ୟାପସନଗୁଡ଼ିକ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ଅଡିଓ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ଟେକ୍ସଟ୍ ଓ ଡିସପ୍ଲେ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ସ୍କ୍ରିନକୁ ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ନୀଳ-ହଳଦିଆ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ଉଜ୍ଜ୍ୱଳତା କମାନ୍ତୁ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ସ୍କ୍ରିନକୁ ଆପଣଙ୍କ ଫୋନର ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଅପେକ୍ଷା ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ସ୍କ୍ରିନକୁ ଆପଣଙ୍କ ଟାବଲେଟର ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଅପେକ୍ଷା ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ ଯାହା ଫଳରେ ପଢ଼ିବା ଅଧିକ ସୁବିଧାଜନକ ହେବ।&lt;br/&gt;&lt;br/&gt; ଏହା ଉପଯୋଗୀ ହୋଇପାରେ ଯେତେବେଳେ: &lt;ol&gt; &lt;li&gt; ଆପଣଙ୍କ ଫୋନର ଡିଫଲ୍ଟ ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଏବେ ବି ଅତ୍ୟଧିକ ଉଜ୍ଜ୍ୱଳ ଅଛି&lt;/li&gt; &lt;li&gt; ରାତିରେ କିମ୍ବା ଶୋଇବା ପୂର୍ବରୁ ଏକ ଅନ୍ଧାରୁଆ ରୁମ୍ ପରି ଅନ୍ଧକାର ସ୍ଥିତିରେ ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରୁଛନ୍ତି&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ରିଙ୍ଗଟୋନ୍‌"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ଅନ୍ୟ ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେସନ୍"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ବିଜ୍ଞପ୍ତି"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ବାର୍ତ୍ତାଳାପ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ବର୍ତ୍ତମାନ ବିଜ୍ଞପ୍ତି ପଠାଇଥିବା ଆପ୍"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ବିଗତ 7 ଦିନର ସବୁକୁ ଦେଖନ୍ତୁ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ଉନ୍ନତ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ସାଧାରଣ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"କାର୍ଯ୍ୟ ବିଜ୍ଞପ୍ତି"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତି ପ୍ରାଥମିକତା"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍, ଷ୍ଟାଟସ୍ ବାର୍ ଏବଂ ଲକ୍ ସ୍କ୍ରିନ୍‌ରେ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ଷ୍ଟାଟସ୍ ବାରରେ ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ଆଲୋକକୁ ଧପଧପ କର"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ଲକ୍ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ଗୋପନୀୟତା"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ଲକ୍ ସ୍କ୍ରିନ୍‍କୁ ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ଫେସ୍ ଅନ୍‍ଲକ୍ କରିବା ପରେ ସିଧାସଳଖ ଗତ ଥର ବ୍ୟବହାର କରାଯାଇଥିବା ସ୍କ୍ରିନ୍‌କୁ ଯାଆନ୍ତୁ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ଲକ୍ ସ୍କ୍ରିନ୍, ଲକ୍‌ସ୍କ୍ରିନ୍, ବାଦ୍ ଦିଅନ୍ତୁ, ବାଏପାସ୍"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"ଆଲର୍ଟ କରୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ଏହି ଶ୍ରୋତାଙ୍କ ପାଇଁ ବ୍ରିଜ୍ ହୋଇନଥିବା ଆପଗୁଡ଼ିକ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ସମସ୍ତ ଆପ୍ ବ୍ରିଜ୍ ହୋଇଛି"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%dଟି ଆପ୍ ବ୍ରିଜ୍ ହୋଇନାହିଁ</item>
+      <item quantity="one">%dଟି ଆପ୍ ବ୍ରିଜ୍ ହୋଇନାହିଁ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ବ୍ରିଜ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ସାହାଯ୍ୟକାରୀ ସେବା"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ସାହାଯ୍ୟକାରୀ ସେବା ଭାବରେ ଚଲାଯିବା ପାଇଁ, ଇନଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ଅନୁରୋଧ କରିନାହିଁ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ VR ସେବା ଆକ୍ସେସକୁ ଅନୁମତି ଦେବେ?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">୧ଟି ପ୍ରତିବନ୍ଧକ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ଡିଭାଇସ୍‌ର ଗଣନାଠାରୁ କେରିଅର୍‌ର ଡାଟା ଗଣନା ଭିନ୍ନ ହୋଇପାରେ।"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ନୁହେଁ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟାକୁ ବାଦ୍ ଦିଆଯାଇଛି"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ଡାଟା ଚେତାବନୀ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ଡାଟା ଚେତାବନୀ"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ନେଟ୍‌ୱର୍କ ଅପରେଟିଙ୍ଗ ମୋଡ୍‌କୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ପସନ୍ଦର ନେଟୱାର୍କ ପ୍ରକାର"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ବାହକ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ସେଟିଂସ୍ ସଂସ୍କରଣ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"କଲିଂ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ବାହକ ଭିଡିଓ କଲିଂ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ସିଷ୍ଟମ୍‌ ଚୟନ କରନ୍ତୁ"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMକୁ ପୁଣି ଚାଲୁ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ନେଟୱାର୍କ ସକ୍ରିୟକରଣ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"କ୍ୟାରିଅର୍ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ସେଟିଂସକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଇଛି"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ଅସ୍ଥାୟୀ ଭାବେ ଅନୁପଲବ୍ଧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"କୌଣସି SIM ନାହିଁ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ପସନ୍ଦଗୁଡ଼ିକ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ନେଟୱାର୍କ ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ସାର୍ବଜନୀନ ନେଟୱାର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ନେଟୱାର୍କ ସଂଯୋଗ, ଇଣ୍ଟରନେଟ୍, ୱାୟାରଲେସ୍, ଡାଟା, ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ୱାଇ ଫାଇ, ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ, ସେଲ୍ କ୍ୟାରିଅର୍, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ସଂଯୋଗ ଠିକ୍ କରନ୍ତୁ"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଉପଲବ୍ଧ ଅଛି"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ନେଟୱାର୍କ ସୁଇଚ୍ କରିବାକୁ, ଇଥରନେଟ୍ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ସଂଯୋଗ କରାଯାଇଥିବା ସମୟରେ ନେଟୱାର୍କ୍ ସ୍ୱିଚ୍ କରିପାରିବ ନାହିଁ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ସଂଯୋଗ କରାଯାଇଛି"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ଫୋନ୍ ନମ୍ଵର୍ ଲେଖନ୍ତୁ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ଫୋନ୍ ନମ୍ଵର୍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ଠିକ୍ ଅଛି"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index bed0e46..77e4970 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਦੀ ਲਿਖਤ ਨੂੰ ਛੋਟਾ ਜਾਂ ਵੱਡਾ ਕਰੋ।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ਵੱਡਾ ਕਰੋ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ਸਵੈ-ਘੁਮਾਓ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ਜੇ ਕੋਈ ਵਿਅਕਤੀ ਸਕ੍ਰੀਨ ਵੱਲ ਦੇਖ ਰਿਹਾ ਹੈ ਅਤੇ ਕਿਸ ਤਰੀਕੇ ਨਾਲ ਦੇਖ ਰਿਹਾ ਹੈ, ਇਹ ਦੇਖਣ ਲਈ ਚਿਹਰਾ-ਆਧਾਰਿਤ ਸਵੈ-ਘੁਮਾਓ ਸੁਵਿਧਾ ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕਰਦੀ ਹੈ। ਇਹ ਸੁਵਿਧਾ ਲੇਟੇ ਹੋਏ ਦੌਰਾਨ ਪੜ੍ਹਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ ਅਤੇ ਚਿੱਤਰਾਂ ਨੂੰ ਕਦੇ ਵੀ ਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ ਜਾਂ ਉਹਨਾਂ ਨੂੰ Google \'ਤੇ ਨਹੀਂ ਭੇਜਿਆ ਜਾਂਦਾ।&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ਹੋਰ ਜਾਣੋ&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ਨਮੂਨਾ ਲਿਖਤ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਵਿਜ਼ਾਰਡ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ਪਾਠ 11: ਔਜ਼ ਦਾ ਹੀਰਿਆਂ-ਪੰਨਿਆਂ ਵਾਲਾ ਨਿਰਾਲਾ ਸ਼ਹਿਰ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ਖੋਜੋ"</string>
     <string name="display_settings" msgid="7197750639709493852">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ਸਕ੍ਰੀਨ ਸਵੈ-ਘੁਮਾਓ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ਬੰਦ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ਚਾਲੂ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ਚਾਲੂ - ਚਿਹਰਾ-ਆਧਾਰਿਤ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ਚਿਹਰਾ ਪਛਾਣ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ਰੰਗ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ਕੁਦਰਤੀ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ਵਧਾਇਆ ਗਿਆ"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ਹੋਰ ਉਪਭੋਗਤਾ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ਵਿੱਚੋਂ <xliff:g id="USED">%1$s</xliff:g> ਵਰਤਿਆ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ਵਿੱਚੋਂ ਵਰਤੀ ਗਈ"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਵਾਲੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ, ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ਬਲੁਟੂੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ਫੌਂਟ ਦਾ ਆਕਾਰ ਬਦਲੋ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ਸਕ੍ਰੀਨ ਰੀਡਰ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ਆਡੀਓ ਅਤੇ ਆਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ਸੁਰਖੀਆਂ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ਆਡੀਓ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ਡਿਸਪਲੇ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ਲਿਖਤ ਸੁਨੇਹਾ ਅਤੇ ਡਿਸਪਲੇ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ਸਕ੍ਰੀਨ ਦਾ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ਨੀਲਾ-ਪੀਲਾ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ਚਮਕ ਘਟਾਓ"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ਸਕ੍ਰੀਨ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਨਾਲੋਂ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ਸਕ੍ਰੀਨ ਨੂੰ ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੀ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਨਾਲੋਂ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਗੂੜ੍ਹੀ ਹੈ ਤਾਂ ਜੋ ਇਹ ਪੜ੍ਹਨ ਲਈ ਹੋਰ ਸਹਿਜ ਹੋਵੇ।&lt;br/&gt;&lt;br/&gt; ਇਹ ਉਦੋਂ ਲਾਹੇਵੰਦ ਹੋ ਸਕਦਾ ਹੈ ਜਦੋਂ: &lt;ol&gt; &lt;li&gt; ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਹਾਲੇ ਵੀ ਬਹੁਤ ਚਮਕਦਾਰ ਹੋਵੇ&lt;/li&gt; &lt;li&gt; ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਹਨੇਰੇ ਵਾਲੀਆਂ ਸਥਿਤੀਆਂ ਵਿੱਚ ਕਰ ਰਹੇ ਹੋਵੋ, ਜਿਵੇਂ ਕਿ ਰਾਤ ਜਾਂ ਸੋਣ ਤੋਂ ਪਹਿਲਾਂ ਹਨੇਰੇ ਕਮਰੇ ਵਿੱਚ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ਗੱਲਬਾਤ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ਹਾਲ ਵਿੱਚ ਭੇਜੀਆਂ ਗਈਆਂ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ਪਿਛਲੇ 7 ਦਿਨਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਦੇਖੋ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ਵਿਕਸਿਤ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ਸਧਾਰਨ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ਅਨੁਕੂਲ ਸੂਚਨਾਵਾਂ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਤਰਜੀਹ"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ, ਸਥਿਤੀ ਪੱਟੀ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ਲਾਕ ਸਕ੍ਰੀਨ ਛੱਡੋ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ਚਿਹਰਾ ਅਣਲਾਕ ਤੋਂ ਬਾਅਦ, ਸਿੱਧਾ ਪਿਛਲੀ ਵਾਰ ਵਰਤੀ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਓ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ਲਾਕ ਸਕ੍ਰੀਨ, ਲਾਕਸਕ੍ਰੀਨ, ਛੱਡੋ, ਅਣਡਿੱਠ"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"ਗੱਲਬਾਤ ਸੰਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"ਸੁਚੇਤ ਕਰਨ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ਉਹ ਐਪਾਂ ਜਿਨ੍ਹਾਂ ਨੂੰ ਇਸ ਸਰੋਤੇ ਨਾਲ ਬਰਿੱਜ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ਸਾਰੀਆਂ ਐਪਾਂ ਬਰਿੱਜ ਕੀਤੀਆਂ ਹੋਈਆਂ ਹਨ"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d ਐਪ ਬਰਿੱਜ ਨਹੀਂ ਕੀਤੀ ਹੋਈ ਹੈ</item>
+      <item quantity="other">%d ਐਪਾਂ ਬਰਿੱਜ ਨਹੀਂ ਕੀਤੀਆਂ ਹੋਈਆਂ ਹਨ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ਬਰਿੱਜ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ਮਦਦਗਾਰ ਸੇਵਾਵਾਂ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ਕੋਈ ਵੀ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵੱਲੋਂ VR ਸਹਾਇਕ ਸੇਵਾਵਾਂ ਵਜੋਂ ਚਲਾਉਣ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਗਈ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ VR ਸੇਵਾ ਪਹੁੰਚ ਨੂੰ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਤਿਬੰਧ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ਕੈਰੀਅਰ ਵੱਲੋਂ ਡਾਟੇ ਦਾ ਹਿਸਾਬ ਡੀਵਾਈਸ ਦੇ ਹਿਸਾਬ ਨਾਲੋਂ ਵੱਖਰਾ ਹੋ ਸਕਦਾ ਹੈ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ ਵੱਲੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਡਾਟਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ ਵੱਲੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਡਾਟਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ਡਾਟਾ ਚਿਤਾਵਨੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ਡਾਟਾ ਚਿਤਾਵਨੀ"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ਕੈਰੀਅਰ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ਸੈਟਿੰਗਾਂ ਦਾ ਵਰਜਨ"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"ਕਾਲਿੰਗ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ਸਿਸਟਮ ਵੱਲੋਂ ਚੁਣਿਆ"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ਸਿਮ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ਨੈੱਟਵਰਕ ਕਿਰਿਆਸ਼ੀਲਤਾ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ਕੈਰੀਅਰ ਨੂੰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ਸੈਟਿੰਗਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ਕੁਝ ਸਮੇਂ ਲਈ ਅਣਉਪਲਬਧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ਕੋਈ ਸਿਮ ਨਹੀਂ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ਤਰਜੀਹਾਂ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ਨੈੱਟਵਰਕ ਤਰਜੀਹਾਂ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਦੇਖੋ"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"ਕਨੈਕਟੀਵਿਟੀ ਠੀਕ ਕਰੋ"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹਨ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ਨੈੱਟਵਰਕ ਬਦਲਣ ਲਈ, ਈਥਰਨੈੱਟ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ਕਨੈਕਟ ਕੀਤੇ ਹੋਣ ਵੇਲੇ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਨਹੀਂ ਬਦਲ ਸਕਦੇ"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ਕਨੈਕਟ ਹੈ"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ਫ਼ੋਨ ਨੰਬਰ ਦਾਖਲ ਕਰੋ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ਫ਼ੋਨ ਨੰਬਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ਠੀਕ ਹੈ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1ec4bf8..ac215e2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Powiększ lub pomniejsz tekst na ekranie."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pomniejsz"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Powiększ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Użyj autoobracania"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Autoobracanie na podstawie twarzy wykorzystuje aparat przedni, by określić, czy i jak ktoś patrzy na ekran. Ułatwia to czytanie podczas leżenia, a obrazy nigdy nie są zapisywane ani przekazywane do Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Więcej informacji&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Przykładowy tekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Czarnoksiężnik z Krainy Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Rozdział 11: Szmaragdowe Miasto"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Wyszukiwanie"</string>
     <string name="display_settings" msgid="7197750639709493852">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Autoobracanie ekranu"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Wyłączono"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Włączono"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Włączono – na podstawie twarzy"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Włącz wykrywanie twarzy"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kolory"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Wzmocnione"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Inni użytkownicy"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Pamięć urządzenia"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Pamięć przenośna"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Wykorzystane <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Żadne aplikacje ostatnio nie korzystały z lokalizacji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Wysokie użycie baterii"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niskie użycie baterii"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skanowanie Wi‑Fi i Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skanowanie Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Zezwól na wyszukiwanie sieci Wi-Fi przez aplikacje i usługi w dowolnym momencie, nawet gdy Wi-Fi jest wyłączone. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanowanie Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Bluetooth jest wyłączony. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usługi lokalizacyjne do pracy"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Wykrywanie strefy czasowej lokalizacji"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Wykrywanie strefy czasowej lokalizacji"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Czytniki ekranu"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Dźwięk i tekst na ekranie"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Napisy"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Dźwięk"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Wyświetlacz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i wyświetlanie"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Przyciemnij ekran"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Niebieski-żółty"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zmniejsz jasność"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Przyciemnij ekran bardziej niż przy minimalnej jasności telefonu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Przyciemnij ekran bardziej niż przy minimalnej jasności tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Przyciemnij ekran, aby wygodniej czytać.&lt;br/&gt;&lt;br/&gt; Może to być pomocne, gdy: &lt;ol&gt; &lt;li&gt; minimalna jasność telefonu jest zbyt jasna;&lt;/li&gt; &lt;li&gt; używasz telefonu w ciemności, np. w nocy lub w ciemnym pokoju przed zaśnięciem.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Dzwonki"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Inne dźwięki i wibracje"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Powiadomienia"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Rozmowa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Ostatnio wysłane"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobacz wszystkie z ostatnich 7 dni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Zaawansowane"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ogólne"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Powiadomienia związane z pracą"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Powiadomienia adaptacyjne"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorytet powiadomień adaptacyjnych"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wyświetlaj w obszarze powiadomień, na pasku stanu i ekranie blokady"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ukryj ciche powiadomienia na pasku stanu"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Migająca dioda"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Powiadomienia na ekranie blokady"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Prywatność"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pomijanie ekranu blokady"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po rozpoznaniu twarzy przejdź od razu do ostatnio używanego ekranu"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran blokady, Pomiń, Pomijaj"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Powiadomienia w rozmowach"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Alerty"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Ciche powiadomienia"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacje niepołączone z tym detektorem"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Wszystkie aplikacje są połączone"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="few">%d aplikacje nie są połączone</item>
+      <item quantity="many">%d aplikacji nie jest połączonych</item>
+      <item quantity="other">%d aplikacji nie jest połączone</item>
+      <item quantity="one">%d aplikacja nie jest połączona</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Połączone aplikacje"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usługi pomocnicze rzeczywistości wirtualnej"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Żadne zainstalowane aplikacje nie prosiły o uruchomienie w trybie usług pomocniczych rzeczywistości wirtualnej."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Zezwalasz usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do usługi rzeczywistości wirtualnej?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="one">1 ograniczenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Użycie danych w sieciach operatorów nie jest uwzględniane"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Użycie danych w sieciach operatorów nie jest uwzględniane"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ustaw ostrzeżenie dotyczące danych"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ostrzeżenie dotyczące danych"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Zmień tryb działania sieci"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferowany typ sieci"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Wersja ustawień"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Połączenia"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Rozmowy wideo w sieci operatora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Wybór systemu"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Wyjmij kartę SIM i włóż ją ponownie. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Spróbuj ponownie włączyć kartę SIM. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktywacja sieci"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Przełączanie operatora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Sieć <xliff:g id="CARRIER_NAME">%1$s</xliff:g> jest aktywna"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Kliknij, by zaktualizować ustawienia karty SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Przełączono na sieć <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"niedostępne"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Chwilowo niedostępna"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Brak karty SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Ustawienia"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ustawienia sieci"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Łącz się z sieciami publicznymi"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"połączenie sieciowe, internet, bezprzewodowy, dane, Wi-Fi, wi-fi, wi fi, komórka, telefon, operator komórkowy, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Wyświetl sieci dostępne w trybie samolotowym"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Rozwiąż problemy z połączeniami"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostępne sieci działające w trybie samolotowym"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aby przełączać sieci, odłącz Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nie można przełączyć sieci po połączeniu"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sieci działające w trybie samolotowym"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Połączono"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Wpisz numer telefonu"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Brak numeru telefonu."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Zezwól na 2G"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d220ed2..40f17a0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumentar ou diminuir o texto na tela"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Tornar menor"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Tornar maior"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar o giro automático"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Usando a câmera frontal, o giro automático com reconhecimento facial detecta se e como alguém está olhando para a tela. Ele permite que o usuário leia enquanto está deitado, e as imagens nunca são armazenadas ou enviadas para o Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saiba mais&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de amostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Mágico de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: A maravilhosa Cidade das Esmeraldas de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tela"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Giro automático da tela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativado"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativado"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativ. - Reconhecimento facial"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar a detecção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realçadas"</string>
@@ -1478,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuários"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir a definição de alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permitir que este app programe alarmes ou outros eventos de tempo. Com isso, ele poderá funcionar mesmo quando você não estiver usando o dispositivo. Se essa permissão for revogada, o app poderá apresentar falhas, especificamente nos alarmes programados por ele, que deixarão de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programação, alarme, lembrete, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhum app acessou o local recentemente"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da bateria reduzido"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca por Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca por Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que apps e serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
@@ -2144,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
@@ -2297,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir brilho"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Use o smartphone com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Use o tablet com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Diminua o brilho da tela para deixar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Esse recurso pode ser útil quando: &lt;ol&gt; &lt;li&gt; o brilho mínimo padrão do smartphone ainda é claro demais;&lt;/li&gt; &lt;li&gt; você está usando o smartphone em ambientes com pouca iluminação, como à noite ou em um quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade de notificação adaptável"</string>
@@ -3568,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificações silenciosas na barra de status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações na tela de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Depois do desbloqueio facial, ir para a última tela usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
@@ -3680,13 +3683,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações com alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps que não estão conectados em ponte a esse listener"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todos os apps estão em ponte"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d app não está conectado em ponte</item>
+      <item quantity="other">%d apps não estão conectados em ponte</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Apps em ponte"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviços de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4351,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4892,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferencial"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadora"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das configurações"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versão das configurações da operadora"</string>
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas pela operadora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Seleção de sistema"</string>
@@ -4941,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operadora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Mudou para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo avião"</string>
@@ -5130,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
@@ -5165,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7580ac3..63e2cc3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumente ou diminua o texto no ecrã."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Diminuir"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Utilize a rotação automática"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"A rotação automática baseada no rosto utiliza a câmara frontal para ver se e como alguém está a olhar para o ecrã. Permite ler deitado e as imagens nunca são armazenadas nem enviadas para a Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saiba mais&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemplo de texto"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Maravilhoso Feiticeiro de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: A Maravilhosa Cidade Esmeralda de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rodar ecrã automaticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativada"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativada"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativada – Com base no rosto"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar deteção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Amplificadas"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros utilizadores"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilizados de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Utilizado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhuma aplicação acedeu recentemente à localização"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Utilização de bateria elevada"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Utilização de bateria baixa"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Procura de Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Procura de Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Procurar por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteção do fuso horário da localização"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteção do fuso horário da localização"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar o tamanho do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de ecrã"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto no ecrã"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Visualização"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e visualização"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escureça o ecrã"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir o brilho"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Torne o ecrã mais escuro do que o brilho mínimo do seu telemóvel."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Torne o ecrã mais escuro do que o brilho mínimo do seu tablet."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Escureça o ecrã para tornar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Isto pode ser útil quando: &lt;ol&gt; &lt;li&gt; O brilho mínimo predefinido do telemóvel ainda é demasiado intenso.&lt;/li&gt; &lt;li&gt; Está a utilizar o telemóvel em ambientes escuros, como à noite ou num quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas dos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançadas"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificações adaptável"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Apresentar no painel pendente, na barra de estado e no ecrã de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar as notificações silenciosas na barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Emitir luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações no ecrã de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorar ecrã de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Após Desbloqueio facial, aceda ao último ecrã utilizado"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecrã de bloqueio, ignorar"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações de alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps que não estão em bridge para este ouvinte"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todas as apps estão em bridge"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d apps não estão em bridge</item>
+      <item quantity="one">%d app não está em bridge</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Apps em bridge"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de assistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhuma app instalada pediu para ser executada como serviço de assistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir que o serviço de RV tenha acesso a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 restrição</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclui os dados utilizados por redes de operadores."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados utilizados por redes de operadores."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de dados"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de funcionamento em rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das definições"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas do operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selecionar sistema"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o SIM e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Experimente ativar o SIM novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação da rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"O operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as definições do SIM."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Alterado para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponíveis"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"sem cartão SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ligar a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ligação de rede, internet, sem fios, dados, wifi, wi-fi, wi fi, telemóvel, dispositivo móvel, operador de telemóvel, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo de avião"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir a conetividade"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo de avião disponíveis."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desligue a Ethernet."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não pode mudar de rede enquanto tiver ligação estabelecida."</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo de avião"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ligado"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduza o número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone está em falta."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d220ed2..40f17a0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumentar ou diminuir o texto na tela"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Tornar menor"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Tornar maior"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar o giro automático"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Usando a câmera frontal, o giro automático com reconhecimento facial detecta se e como alguém está olhando para a tela. Ele permite que o usuário leia enquanto está deitado, e as imagens nunca são armazenadas ou enviadas para o Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saiba mais&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de amostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Mágico de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: A maravilhosa Cidade das Esmeraldas de Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tela"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Giro automático da tela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativado"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativado"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativ. - Reconhecimento facial"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar a detecção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realçadas"</string>
@@ -1478,6 +1472,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuários"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir a definição de alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permitir que este app programe alarmes ou outros eventos de tempo. Com isso, ele poderá funcionar mesmo quando você não estiver usando o dispositivo. Se essa permissão for revogada, o app poderá apresentar falhas, especificamente nos alarmes programados por ele, que deixarão de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programação, alarme, lembrete, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1738,11 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhum app acessou o local recentemente"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da bateria reduzido"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca por Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca por Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que apps e serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
@@ -2144,7 +2143,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
@@ -2297,7 +2298,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir brilho"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Use o smartphone com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Use o tablet com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Diminua o brilho da tela para deixar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Esse recurso pode ser útil quando: &lt;ol&gt; &lt;li&gt; o brilho mínimo padrão do smartphone ainda é claro demais;&lt;/li&gt; &lt;li&gt; você está usando o smartphone em ambientes com pouca iluminação, como à noite ou em um quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3506,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade de notificação adaptável"</string>
@@ -3568,7 +3571,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificações silenciosas na barra de status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações na tela de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Depois do desbloqueio facial, ir para a última tela usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
@@ -3680,13 +3683,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações com alerta"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps que não estão conectados em ponte a esse listener"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Todos os apps estão em ponte"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d app não está conectado em ponte</item>
+      <item quantity="other">%d apps não estão conectados em ponte</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Apps em ponte"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviços de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4351,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4892,7 +4895,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferencial"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadora"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das configurações"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versão das configurações da operadora"</string>
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas pela operadora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Seleção de sistema"</string>
@@ -4941,6 +4944,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operadora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Mudou para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5120,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo avião"</string>
@@ -5130,7 +5134,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
@@ -5165,4 +5168,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d49fc34..5aba954 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Măriți sau micșorați textul de pe ecran."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Micșorați"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Măriți"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Folosiți Rotirea automată"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Rotirea automată în funcție de chip folosește camera frontală pentru a vedea dacă și cum se uită cineva la ecran. Aceasta face posibilă citirea din poziția culcat. Imaginile nu sunt niciodată stocate sau trimise la Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Aflați mai multe&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemplu de text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Minunatul Vrăjitor din Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capitolul 11: Minunatul Oraș de Smarald Oz"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Căutați"</string>
     <string name="display_settings" msgid="7197750639709493852">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotire automată a ecranului"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Dezactivată"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activată"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activată – În funcție de chip"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activați Detectarea facială"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Culori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Intensificat"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Alți utilizatori"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Stocare dispozitiv"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Spațiu de stocare portabil"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Folosit: <xliff:g id="USED">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Folosiți din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nicio aplicație nu a accesat recent locația"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Utilizare intensă a bateriei"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Utilizare redusă a bateriei"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Căutare Wi‑Fi și Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Căutare de rețele Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Căutare Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicii de localizare pentru serviciu"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detectarea fusului orar al locației"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detectarea fusului orar al locației"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modificați dimensiunea fontului"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Cititoare de ecran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio și text pe ecran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrări"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Afișaj"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text și afișaj"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Reduceți luminozitatea ecranului"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Roșu-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Roșu-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Albastru-galben"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduceți luminozitatea"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Întunecați ecranul sub setarea minimă pentru luminozitate a telefonului"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Întunecați ecranul sub setarea minimă pentru luminozitate a tabletei"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Întunecați ecranul pentru a citi mai confortabil.&lt;br/&gt;&lt;br/&gt; Această opțiune poate fi utilă atunci când: &lt;ol&gt; &lt;li&gt; luminozitatea minimă prestabilită a telefonului este prea mare;&lt;/li&gt; &lt;li&gt; folosiți telefonul în condiții de luminozitate scăzută, de exemplu, noaptea sau într-o cameră întunecată înainte de culcare.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonuri de sonerie"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Alte sunete și vibrații"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificări"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversație"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Trimise recent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Afișați-le pe toate din ultimele 7 zile"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avansate"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificări profil de serviciu"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificări adaptive"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritatea notificării adaptabile"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Afișați în fereastra trasă în jos, bara de stare și ecranul de blocare"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ascundeți notificările silențioase din bara de stare"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lumină intermitentă"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificări pe ecranul de blocare"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidențialitate"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omiterea ecranului de blocare"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"După deblocarea facială, accesați direct ultimul ecran folosit"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecran de blocare, Ecran de blocare, Omitere, Evitare"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Notificări pentru conversații"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Notificări de alertare"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Notificări silențioase"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplicații care nu sunt asociate acestei funcții de procesare"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Toate aplicațiile sunt asociate"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="few">%d aplicații nu sunt asociate</item>
+      <item quantity="other">%d de aplicații nu sunt asociate</item>
+      <item quantity="one">%d aplicație nu este asociată</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplicații asociate"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicii de ajutor pentru RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nicio aplicație instalată nu a solicitat să fie rulată ca un serviciu de ajutor pentru RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permiteți accesul la serviciul RV pentru <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="one">1 restricție</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cuantificarea datelor de către operator poate fi diferită de cea de pe dispozitiv"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sunt excluse datele folosite în rețele de operator"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sunt excluse datele folosite în rețele de operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Date utilizate: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setați avertisment pentru date"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avertisment pentru date"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Schimbați modul de operare a rețelei"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipul de rețea preferat"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versiunea setărilor"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Se apelează"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Apelare video prin operator"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selectați sistemul"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Scoateți SIM-ul și introduceți-l din nou. Dacă problema persistă, reporniți dispozitivul."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Încercați din nou să activați SIM-ul. Dacă problema persistă, reporniți dispozitivul."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activarea rețelei"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Schimbarea operatorului"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> este activ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Atingeți pentru a actualiza setările SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ați trecut la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponibile"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporar indisponibil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Niciun card SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferințe"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferințe privind rețeaua"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectați-vă la rețele publice"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexiune la rețea, internet, wireless, date, wifi, wi-fi, wi fi, celular, mobil, operator servicii mobile, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Vedeți rețelele sigure pentru avioane"</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Remediați problemele legate de conectivitate"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sunt disponibile rețele în modul Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pentru a schimba rețeaua, deconectați ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nu puteți schimba rețeaua cât timp dispozitivul e conectat"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rețele acceptate în modul Avion"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectat"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduceți numărul de telefon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Lipsește numărul de telefon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Activați conexiunea 2G"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b7d2603..bb4d0ab 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Сделайте текст на экране мельче или крупнее."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Уменьшить"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Увеличить"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоповорот"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Используя фронтальную камеру, автоповорот на основе распознавания лиц замечает, когда кто-то смотрит на экран, а также определяет, в каком положении находится голова пользователя. Благодаря этой функции удобно читать лежа. Кроме того, сделанные ей изображения не сохраняются и не отправляются в Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Подробнее…&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Пример текста"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Удивительный волшебник из страны Оз"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Глава 11. Изумрудный Город страны Оз"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Поиск"</string>
     <string name="display_settings" msgid="7197750639709493852">"Экран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автоповорот экрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Отключить"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Включить"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Включить (на основе распознавания лиц)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Включить распознавание лиц"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Цвета"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральные"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яркие"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Другие пользователи"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Хранилище устройства"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Съемный накопитель"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Использовано <xliff:g id="USED">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"использовано из <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ни одно приложение ещё не получало доступ к местоположению."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Высокий расход заряда батареи"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Низкий расход заряда батареи"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Поиск сетей Wi-Fi и устройств Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Поиск сетей Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Разрешить приложениям и сервисам искать сети Wi-Fi, даже когда Wi-Fi отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Поиск Bluetooth-устройств"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешить приложениям и сервисам искать устройства поблизости, даже когда Bluetooth отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Геолокация для работы"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Определение часового пояса с помощью геолокации"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Определение часового пояса с помощью геолокации"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Изменить размер шрифта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Программы чтения с экрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и озвучивание текста"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Субтитры"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и отображение"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Уменьшение яркости экрана"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Красный и зеленый"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Красный и зеленый"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синий и желтый"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Уменьшение яркости"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Сделать экран телефона темнее, чем при минимальной яркости"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Сделать экран планшета темнее, чем при минимальной яркости"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Сделайте экран темнее для удобства чтения.&lt;br/&gt;&lt;br/&gt;Это может помочь, если:&lt;ol&gt;&lt;li&gt; при минимальной яркости экран телефона все равно слишком яркий;&lt;/li&gt;&lt;li&gt; вы используете телефон в темноте, например ночью или в темной комнате перед сном.&lt;/li&gt;&lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтоны"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Другие звуки и вибросигналы"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Уведомления"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговоры"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Недавно отправленные"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Смотреть все за последние 7 дней"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Расширенные настройки"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Общие"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Рабочие уведомления"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивные уведомления"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет адаптивных уведомлений"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показывать на панели уведомлений, в строке состояния и на заблокированном экране"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Скрыть беззвучные уведомления в строке состояния"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Световая индикация"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Уведомления на заблок. экране"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Конфиденциальность"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропуск заблок. экрана"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Сразу переходить к последнему открытому экрану после фейсконтроля"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокированный экран, пропустить, перейти"</string>
@@ -3763,7 +3773,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"Адаптивные уведомления"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Нет"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Установленные приложения не запрашивали доступ к уведомлениям"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"Разрешить доступ к уведомлениям"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"Доступ к уведомлениям"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Предоставить приложению \"<xliff:g id="SERVICE">%1$s</xliff:g>\" доступ к уведомлениям?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"Приложение \"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>\" сможет читать все уведомления, в том числе содержащие личную информацию (такую, как имена контактов и сообщения). Кроме того, оно получит право закрывать уведомления и нажимать кнопки в них, например отвечать на звонки. \n\nПриложение сможет включать и отключать режим \"Не беспокоить\", а также менять его настройки."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Открыть приложению \"<xliff:g id="SERVICE">%1$s</xliff:g>\" доступ к уведомлениям?"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Уведомления о сообщениях"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Оповещения"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучные уведомления"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Приложения, которые не подключены к этой службе"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Все приложения подключены"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d приложение не подключено</item>
+      <item quantity="few">%d приложения не подключено</item>
+      <item quantity="many">%d приложений не подключено</item>
+      <item quantity="other">%d приложения не подключено</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Подключенные приложения"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Вспомогательные VR-сервисы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установленные приложения не запрашивали доступ для работы в качестве вспомогательного VR-сервиса"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Разрешить VR-сервису доступ к сервису \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничения</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Данные оператора связи могут отличаться от данных на устройстве."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Исключить данные, переданные через сети оператора связи"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Исключен трафик, переданный через сети оператора связи"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Расход: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Установить предупреждение"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Изменение режима работы сети"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Предпочтительный тип сети"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версия настроек"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Вызовы"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеозвонки"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Выбор системы"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извлеките и снова вставьте SIM-карту. Если проблема не исчезнет, перезапустите устройство."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Попробуйте включить SIM-карту ещё раз. Если проблема не исчезнет, перезапустите устройство."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активация сети"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Переключение между операторами связи"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сеть \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" активна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Нажмите, чтобы обновить настройки SIM-карты."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Вы переключились на сеть <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"Недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нет SIM-карты"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Настройки"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Настройки подключения"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Подключаться к общедоступным сетям"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сетевое подключение, Интернет, беспроводная сеть, передача данных, Wi-Fi, wifi, wi fi, сотовая сеть, мобильный Интернет, сотовый оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Показать сети, доступные в режиме полета"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Исправить проблемы с подключением"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сети, доступные в режиме полета"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Чтобы переключиться между сетями, отключите кабель Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Невозможно переключить сеть, пока установлено подключение"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сети, доступные в режиме полета"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Подключено"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Введите номер телефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефона не указан."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Разрешить 2G"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index b2a4084..e40edc6 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"වෙනත් පරිශීලකයින්"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"උපාංග ආචයනය"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"අතේ ගෙන යා හැකි ගබඩාව"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> න් <xliff:g id="USED">%1$s</xliff:g> ක් භාවිත කළ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> න් භාවිත කළ"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"යෙදුම් කිසිවක් මෑතකදී ස්ථානය වෙත ප්‍රවේශ වූයේ නැත"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ඉහළ බැටරි භාවිතය"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"අඩු බැටරි භාවිතය"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi සහ බ්ලූටූත් ස්කෑන් කිරීම"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi ස්කෑන් කිරීම"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක Wi‑Fi ජාල සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"බ්ලූටූත් පරිලෝකනය"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"වැඩ සඳහා ස්ථානීය සේවා"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ෆොන්ට තරම වෙනස් කරන්න"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"තිර කියවන"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"සිරස්තල"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ශ්‍රව්‍ය"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"සංදර්ශකය"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"පෙළ සහ සංදර්ශකය"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"තිරය අඳුරු කිරීම ක්‍රියාත්මක කිරීම"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"රතු-කොළ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"රතු-කොළ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"නිල්-කහ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"දීප්තිය අඩු කරන්න"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ඔබගේ දුරකථනයේ අවම දීප්තියට වඩා තිරය අඳුරු කරන්න"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ඔබගේ ටැබ්ලටයේ අවම දීප්තියට වඩා තිරය අඳුරු කරන්න"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"කියවීමට වඩාත් පහසු වන ලෙස ඔබගේ තිරය අඳුරු කරන්න.&lt;br/&gt;&lt;br/&gt; මෙය පහත අවස්ථාවලදී ප්‍රයෝජනවත් විය හැකිය: &lt;ol&gt; &lt;li&gt; ඔබගේ දුරකථනයේ පෙරනිමි අවම දීප්තිය තවම ඉතාම දීප්තිමත්ය&lt;/li&gt; &lt;li&gt; ඔබ ඔබගේ දුරකථනය, රාත්‍රියේ හෝ නින්දට යාමට පෙර අඳුරු කාමරයක වැනි අඳුරු අවස්ථාවලදී භාවිත කරයි&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"නාද රිද්ම"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"වෙනත් ශබ්ද සහ කම්පන"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"දැනුම්දීම්"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"සංවාදය"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"මෑතකදී එවන ලද"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"පසුගිය දින 7 වෙතින් සියල්ල බලන්න"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"උසස්"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"පොදු"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"වැඩ දැනුම්දීම්"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"අනුවර්තී දැනුම්දීම්"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"අනුවර්තී දැනුම්දීමේ ප්‍රමුඛතාව"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"පහළ ඇදීමේ සෙවන, තත්ත්‍ව තීරුව තුළ සහ අඟුලු තිරය මත සංදර්ශන කරයි"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"තත්ත්ව තීරුවේ නිහඬ දැනුම් දීම් සඟවන්න"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"නිවී නිවී දැල්වෙන එළිය"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"අගුලු තිරයෙහි දැනුම් දීම්"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"පෞද්ගලිකත්වය"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"අගුළු තිරය මඟ හරින්න"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"මුහුණ අගුළු හැරීමෙන් පසුව, අවසානයට භාවිත තිරයට කෙළින්ම යන්න"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"අගුළු තිරය, අගුළුතිරය, මඟහරින්න, මඟහැරයාම"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="other">සීමා <xliff:g id="COUNT">%1$d</xliff:g>ක්</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"උපාංග ගිණුම්ගත කිරීමෙන් වාහක දත්ත ගිණුම්ගත කිරීම වෙනස් විය හැකිය"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"වාහක ජාල මගින් භාවිත කරන දත්ත බැහැර කරයි"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"වාහක ජාල මගින් භාවිත කරන දත්ත බැහැර කරයි"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> භාවිත විය"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"දත්ත අනතුරු ඇඟවීම සකසන්න"</string>
     <string name="data_warning" msgid="2925054658166062884">"දත්ත අනතුරු ඇඟවීම"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ජාල මෙහෙයුම් ආකාරය වෙනස් කරන්න"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ප්‍රියකරන ජාල වර්ගය"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"වාහකය"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"සැකසීම් අනුවාදය"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"අමතමින්"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"වාහක වීඩියෝ ඇමතීම"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"පද්ධතිය තේරුම"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM එක ඉවත් කර එය නැවත ඇතුළු කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"නැවත SIM එක ක්‍රියාත්මක කිරීමට උත්සාහ කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ජාල සක්‍රිය කිරීම"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"වාහක මාරු වීම"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> සක්‍රියයි"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM සැකසීම් යාවත්කාලීන කිරීමට තට්ටු කරන්න"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු විය"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ලබා ගත නොහැකිය"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"තාවකාලිකව ලබා ගත නොහැකිය"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM නැත"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"මනාප"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ජාල මනාප"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"පොදු ජාලයකට සම්බන්ධ වන්න"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ජාල සම්බන්ධතාව, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wifi, wi-fi, wi fi, සෙලියුලර්, ජංගම, සෙල් වාහක, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ගුවන් යානා ප්‍රකාර ජාල බලන්න"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"සබැඳුම් හැකියාව සකසන්න"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ගුවන් යානා ප්‍රකාර ජාල ලබා ගත හැකිය"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ජාල මාරු කිරීමට, ඊතර්නෙට් විසන්ධි කරන්න"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"සම්බන්ධිත අතරතුර ජාල මාරු කළ නොහැකිය"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ගුවන් යානා ප්‍රකාර ජාල"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"සම්බන්ධයි"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"දුරකථන අංකය ඇතුළත් කරන්න"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"දුරකථන අංකය අස්ථානගතයි."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"හරි"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ඉඩ දෙන්න"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e526044..ddf143f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Zväčšite alebo zmenšite text na obrazovke."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Zmenšiť"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zväčšiť"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Použitie automatického otáčania"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Automatické otáčanie podľa tváre pomocou predného fotoaparátu zistí, či sa používateľ pozerá na obrazovku a akým spôsobom. Umožňuje čítať po ležiačky a snímky sa nikdy neukladajú ani neodosielajú do Googlu.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ďalšie informácie&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukážkový text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarodejník z krajiny Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. kapitola: Nádherné smaragdové mesto"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Hľadať"</string>
     <string name="display_settings" msgid="7197750639709493852">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automaticky otáčať obrazovku"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Vypnuté"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Zapnuté"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Zapnuté – podľa tváre"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Povoliť rozpoznávanie tváre"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farby"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodzené"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Zosilnené"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ďalší používatelia"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Úložisko zariadenia"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosné úložisko"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Využité <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Polohu nedávno nepoužili žiadne aplikácie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nízka spotreba batérie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Vyhľadávanie Wi‑Fi a Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Vyhľadávanie sietí Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať siete Wi‑Fi, a to aj vtedy, keď je sieť Wi-Fi vypnutá. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhľadávanie zariadení Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať zariadenia v okolí, a to aj vtedy, keď je rozhranie Bluetooth vypnuté. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určovania polohy pre prácu"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zisťovanie časového pásma podľa polohy"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zisťovanie časového pásma podľa polohy"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Zmeniť veľkosť písma"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čítačky obrazovky"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovke"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titulky"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazenie"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text a grafika"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Stmavenie obrazovky"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žltá"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zníženie jasu"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Stmavte si obrazovku viac než je minimálny jas vášho telefónu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Stmavte si obrazovku viac než je minimálny jas vášho tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Stmavte si obrazovku, aby sa vám lepšie čítala.&lt;br/&gt;&lt;br/&gt; Môže to byť užitočné: &lt;ol&gt; &lt;li&gt; keď je predvolený minimálny jas vášho telefónu stále príliš vysoký;&lt;/li&gt; &lt;li&gt; keď telefón používate v tmavých prostrediach, napríklad v noci alebo tmavej miestnosti pred spaním.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tóny zvonenia"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ďalšie zvuky a vibrácie"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Upozornenia"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzácia"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedávno odoslané"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobraziť všetko za posledných 7 dní"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Rozšírené"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Všeobecné"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pracovné upozornenia"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prispôsobivé upozornenia"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorita prispôsobivých upozornení"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazovať v rozbaľovacom paneli, stavovom riadku a na uzamknutej obrazovke"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skryť tiché upozornenia v stavovom riadku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikať"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Upozornenia na uzamknutej obrazovke"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Ochrana súkromia"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskakovať uzamknutú obrazovku"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odomk. tvárou priamo prejsť na poslednú použitú obrazovku"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Uzamknutá obrazovka, preskočiť, obísť"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Upozornenia na konverzáciu"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Varovné upozornenia"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Tiché upozornenia"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikácie, ktoré nie sú prepojené s týmto prijímačom"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Všetky aplikácie sú prepojené"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="few">%d aplikácie nie sú prepojené</item>
+      <item quantity="many">%d apps are not bridged</item>
+      <item quantity="other">%d aplikácií nie je prepojených</item>
+      <item quantity="one">%d aplikácia nie je prepojená</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Prepojené aplikácie"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žiadne nainštalované aplikácie nežiadali, aby boli spúšťané ako pomocné služby VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Umožniť službe VR prístup do služby <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vylučuje dáta spotrebované sieťami operátora"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vylúči dáta využité sieťami operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastaviť dátové upozornenie"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dátové upozornenie"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Zmeniť prevádzkový režim siete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferovaný typ siete"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operátor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzia nastavení"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Volanie"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videohovory prostredníctvom operátora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Výber systému"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyberte SIM kartu a znova ju vložte. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Skúste SIM kartu znova zapnúť. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivácia siete"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Prepnutie operátora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operátor <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktívny"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavenia SIM karty"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prepnuté na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie je k dispozícii"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasne nedostupný"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žiadna SIM karta"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Predvoľby"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nastavenia siete"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Pripájať k verejným sieťam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"pripojenie k sieti, internet, bezdrôtové, dátové, wifi, wi-fi, wi fi, mobilné, mobilný operátor, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobraziť siete režimu v lietadle"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Odstrániť problém s pripojením"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Siete dostupné v režime v lietadle"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ak chcete prepnúť siete, odpojte ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Počas pripojenia nie je možné prepnúť siete"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Siete režimu v lietadle"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Pripojené"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadajte telefónne číslo"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chýba telefónne číslo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Povoliť 2G"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9ea9506..70cb3ef 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Pomanjšava ali povečava besedila na zaslonu"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pomanjšanje"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Povečanje"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Uporaba samodejnega zasuka"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Funkcija samodejnega zasuka na podlagi obraza uporablja sprednji fotoaparat, da zazna, ali kdo gleda zaslon in kako to počne. S tem je omogočeno branje leže. Slike se v nobenem primeru ne shranijo in ne pošiljajo Googlu.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Več o tem&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Vzorčno besedilo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čudoviti čarovnik iz Oza"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. poglavje: Čudovito Smaragdno mesto"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Iskanje"</string>
     <string name="display_settings" msgid="7197750639709493852">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Samodejno zasukaj zaslon"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Izklopljeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Vklopljeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Vklopljeno – na podlagi obraza"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogoči zaznavanje obraza"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barve"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naravne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Poudarjene"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi uporabniki"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Shramba naprave"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosna shramba"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Uporabljeno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nobena aplikacija ni nedavno dostopala do lokacije"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka poraba baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nizka poraba baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Iskanje omrežij Wi‑Fi in naprav Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Iskanje omrežij Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Aplikacijam in storitvam omogoči, da kadar koli iščejo omrežja Wi-Fi, tudi ko je Wi-Fi izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Iskanje naprav Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Aplikacijam in storitvam omogoči, da kadar koli iščejo naprave v bližini, tudi ko je Bluetooth izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lokacijske storitve za službo"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"To napravo lahko prilagodite svojim potrebam. Te funkcije za ljudi s posebnimi potrebami lahko pozneje spremenite v nastavitvah."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Spremenite velikost pisave"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Bralniki zaslona"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvok in besedilo na zaslonu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Podnapisi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvok"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Besedilo in prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Potemnitev zaslona"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modra – rumena"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zmanjšanje svetlosti"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Nastavite lahko, da bo zaslon telefona temnejši od najmanjše svetlosti."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Nastavite lahko, da bo zaslon tabličnega računalnika temnejši od najmanjše svetlosti."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Potemnite zaslon, da bo branje prijetnejše.&lt;br/&gt;&lt;br/&gt; To je uporabno v teh primerih: &lt;ol&gt; &lt;li&gt; Privzeta najmanjša svetlost zaslona telefona je presvetla.&lt;/li&gt; &lt;li&gt; Telefon uporabljate v temnih okoliščinah, na primer ponoči ali v temni sobi, preden greste spat.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvonjenja"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvoki in vibriranja"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obvestila"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pogovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Prikaz vseh za zadnjih 7 dni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Dodatno"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Splošno"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obvestila za delovni profil"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obvestila"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljiva prednost obvestil"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaz na poteznem zaslonu z obvestili, v vrstici stanja in na zaklenjenem zaslonu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skrivanje tihih obvestil v vrstici stanja"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Utripajoča lučka"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obvestila na zaklenjenem zaslonu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Zasebnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskok zaklenjenega zaslona"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odklepanju z obrazom se odpre nazadnje uporabljeni zaslon"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"odklepanje zaslona, zaklenjen zaslon, preskok, zaobitje"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Obvestila za pogovor"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Obvestila z opozorilom"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Tiha obvestila"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacije, ki niso v premostitvenem načinu s tem poslušalcem"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Vse aplikacije so v premostitvenem načinu"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d aplikacija ni v premostitvenem načinu.</item>
+      <item quantity="two">%d aplikaciji nista v premostitvenem načinu.</item>
+      <item quantity="few">%d aplikacije niso v premostitvenem načinu.</item>
+      <item quantity="other">%d aplikacij ni v premostitvenem načinu.</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplikacije v premostitvenem načinu"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Storitve za pomoč za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nobena nameščena aplikacija ni zahtevala izvajanja kot storitev za pomoč za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Dovolite storitvi <xliff:g id="SERVICE">%1$s</xliff:g> dostop za storitev za VR?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaterjeve meritve prenosa podatkov so morda drugačne kot v napravi"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne vključuje podatkov, prenesenih v omrežjih operaterjev"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne vključuje podatkov, ki jih uporabljajo omrežja operaterjev."</string>
     <string name="data_used_template" msgid="8229342096562327646">"Preneseno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="2925054658166062884">"Opozorilo za prenos podatkov"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Sprememba načina delovanja omrežja"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Prednostna vrsta omrežja"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Različica nastavitev"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Klicanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoklicanje prek operaterja"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemska izbira"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kartico SIM odstranite in jo znova vstavite. Če s tem ne odpravite težave, znova zaženite napravo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Poskusite znova vklopiti kartico SIM. Če s tem ne odpravite težave, znova zaženite napravo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija omrežja"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Preklop operaterja"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktiven"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dotaknite se, če želite posodobiti nastavitve kartice SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Preklopljeno na omrežje operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ni na voljo"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Začasno ni na voljo"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ni kartice SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nastavitve"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Omrežne nastavitve"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povezovanje z javnimi omrežji"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"omrežna povezava, internet, brezžično, podatki, wifi, wi-fi, wi fi, mobilno omrežje, mobilno, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži omrežja za uporabo v letalu"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Odpravljanje težav s povezavo"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Razpoložljiva omrežja v načinu za letalo"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Če želite preklopiti omrežje, prekinite ethernetno povezavo."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Preklop med omrežji ni mogoč ob vzpostavljeni povezavi."</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Omrežja v načinu za letalo"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Vnesite telefonsko številko"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manjka telefonska številka."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"V redu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Omogočenje 2G"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a9f0e1d..3bb925c 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Përdorues të tjerë"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Hapësira për ruajtje e pajisjes"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hapësira ruajtëse e lëvizshme"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> të përdorura nga <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Përdorur nga gjithsej <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Asnjë aplikacion nuk ka pasur qasje te vendndodhja së fundi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Përdorimi i lartë i baterisë"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Përdorim i ulët baterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skanimi për Wi‑Fi dhe Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skanimi i Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Lejo që aplikacionet dhe shërbimet të skanojnë për rrjete Wi-Fi në çdo moment, edhe kur Wi-Fi është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanimi i Bluetooth-it"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lejo që aplikacionet dhe shërbimet të skanojnë për pajisje në afërsi në çdo moment, edhe kur Bluetooth është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Shërbimet e vendndodhjes për punë"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zbulimi i brezit orar të vendndodhjes"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zbulimi i brezit orar të vendndodhjes"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto veçori të qasshmërisë mund të ndryshohen më vonë te \"Cilësimet\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ndrysho madhësinë e shkrimit"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lexuesit e ekranit"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioja dhe teksti në ekran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titrat"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekrani"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksti dhe ekrani"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bëj ekranin më të errët"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"E kaltër - e verdhë"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Redukto ndriçimin"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Bëje ekranin më të errët se ndriçimi minimal i telefonit"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Bëje ekranin më të errët se ndriçimi minimal i tabletit"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Bëje ekranin më të errët në mënyrë që të jetë më komod për t\'u lexuar.&lt;br/&gt;&lt;br/&gt; Kjo mund të jetë e dobishme kur: &lt;ol&gt; &lt;li&gt; Ndriçimi minimal i parazgjedhur i telefonit tënd është përsëri tepër i ndritshëm&lt;/li&gt; &lt;li&gt; Po e përdor telefonin në situata të errëta, si natën ose në një dhomë të errët përpara gjumit&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zilet"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Tinguj dhe dridhje të tjera"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Njoftimet"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Biseda"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Dërguar së fundi"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Shih të gjithë apl. në 7 ditët e fundit"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Të përparuara"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Të përgjithshme"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Njoftimet e punës"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Njoftimet me përshtatje"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Përparësia e njoftimeve me përshtatje"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Shfaq në strehën me tërheqje poshtë, shiritin e statusit dhe në ekranin e kyçjes"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fshih njoftimet në heshtje në shiritin e statusit"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Drita me pulsim"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Njoftimet në ekranin e kyçjes"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatësia"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Të kapërcyer ekranin e kyçjes"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pas shkyçjes me fytyrë, shko direkt te ekrani i fundit i përdorur"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekrani i kyçjes, ekrani i bllokimit, kapërce, anashkalo"</string>
@@ -3662,11 +3678,11 @@
     <string name="no_notification_assistant" msgid="2533323397091834096">"Asnjë"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Asnjë apl. i instaluar nuk ka kërkuar qasje te njoftimet."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Lejo qasjen te njoftimet"</string>
-    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Të lejohet qasja e njoftimeve për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Të lejohet qasja te njoftimet për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> do të jetë në gjendje të lexojë të gjitha njoftimet, duke përfshirë informacione personale të tilla si emrat e kontakteve dhe tekstin e mesazheve që merr. Ky aplikacion do të jetë gjithashtu në gjendje të largojë njoftimet ose të veprojë mbi butonat te njoftimet, duke përfshirë përgjigjen ndaj telefonatave. \n\nKjo do t\'i japë aplikacionit aftësinë për të aktivizuar ose çaktivizuar \"Mos shqetëso\" dhe për të ndryshuar cilësimet përkatëse."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Të lejohet qasja te njoftimet për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> do të jetë në gjendje të lexojë të gjitha njoftimet, duke përfshirë informacione personale të tilla si emrat e kontakteve dhe tekstin e mesazheve që merr. Ky aplikacion do të jetë gjithashtu në gjendje të largojë njoftimet ose të veprojë mbi butonat te njoftimet, duke përfshirë përgjigjen ndaj telefonatave. \n\nKjo do t\'i japë aplikacionit aftësinë për të aktivizuar ose çaktivizuar \"Mos shqetëso\" dhe për të ndryshuar cilësimet përkatëse."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Nëse çaktivizon qasjen e njoftimeve për <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, mund të çaktivizohet edhe qasja e \"Mos shqetëso\"."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Nëse çaktivizon qasjen te njoftimet për <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, mund të çaktivizohet edhe qasja te \"Mos shqetëso\"."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Çaktivizo"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anulo"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Llojet e njoftimeve të lejuara"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Njoftimet e bisedës"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Njoftimet sinjalizuese"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Njoftimet në heshtje"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Aplikacionet që nuk janë të lidhura me këtë aplikacion dëgjues të njoftimeve"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Të gjitha aplikacionet janë të lidhura"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d aplikacione nuk janë lidhuir</item>
+      <item quantity="one">%d aplikacion nuk është lidhur</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Aplikacionet e lidhura"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Shërbimet e ndihmësit VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asnjë aplikacion i instaluar nuk ka kërkuar të ekzekutohet si shërbim ndihmësi VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Të lejohet qasja e shërbimit VR për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4173,7 +4189,7 @@
     <string name="no_data_usage" msgid="4665617440434654132">"Nuk janë përdorur të dhëna"</string>
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"Të lejohet qasja te \"Mos shqetëso\" për \"<xliff:g id="APP">%1$s</xliff:g>\"?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Aplikacioni do të jetë në gjendje të aktivizojë/çaktivizojë opsionin \"Mos shqetëso\", si dhe të bëjë ndryshimet në cilësimet përkatëse."</string>
-    <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Duhet të qëndrojë e aktivizuar sepse qasja e njoftimeve është e aktivizuar"</string>
+    <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Duhet të qëndrojë e aktivizuar sepse qasja te njoftimet është e aktivizuar"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Të anulohet qasja te \"Mos shqetëso\" për <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Të gjitha rregullat e \"Mos shqetëso\" të krijuara nga ky aplikacion, do të hiqen."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Mos optimizo"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 kufizim</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga llogaritja e pajisjes"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Përjashton të dhënat që përdoren nga rrjetet e operatorit celular"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Përjashton të dhënat që përdoren nga rrjetet e operatorëve celularë"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Cakto paralajm. për të dhënat"</string>
     <string name="data_warning" msgid="2925054658166062884">"Paralajmërimi i të dhënave"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ndrysho modalitetin e operimit të rrjetit"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Lloji i rrjetit të preferuar"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatori celular"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versioni i cilësimeve"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Po telefonon"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Telefonata me video e operatorit celular"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Përzgjedhja e sistemit"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hiq kartën SIM dhe fute përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Provo të aktivizosh kartën SIM përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivizimi i rrjetit"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Ndërrimi i operatorit celular"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> është aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trokit për të përditësuar cilësimet e kartës SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Kaloi te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"e padisponueshme"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Nuk ofrohet për momentin"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nuk ka kartë SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencat"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencat e rrjetit"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Lidhu me rrjetet publike"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"lidhja e rrjetit, internet, pa tel, të dhëna, wifi, wi-fi, wi fi, rrjeti celular, celular, operatori celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Shiko rrjetet e modalitetit të aeroplanit"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Rregullo problemin me lidhshmërinë"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ofrohen rrjete të modalitetit të aeroplanit"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Për të ndërruar rrjetet, shkëput eternetin"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Rrjetet nuk mund të ndërrohen kur je lidhur"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rrjetet e \"Modalitetit të aeroplanit\""</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Lidhur"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Fut numrin e telefonit"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numri i telefonit mungon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Në rregull"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Lejo 2G"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index decc498..5f60c00 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,10 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Омогућава да текст на екрану буде мањи или већи."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Умањи"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Увећај"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Користите аутоматско ротирање"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Аутоматско ротирање на основу лица користи предњу камеру да би утврдило да ли и како неко гледа у екран. То омогућава читање док лежите, а слике се никад не чувају нити шаљу Google-у.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Сазнајте више&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Пример текста"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чаробњак из Оза"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Поглавље 11: Чудесни Смарагдни град Оза"</string>
@@ -1196,14 +1194,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Претрага"</string>
     <string name="display_settings" msgid="7197750639709493852">"Екран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Аутоматско ротирање екрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Искључено"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Укључено"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Укључено – на основу лица"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Омогући препознавање лица"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Боје"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природне"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Појачане"</string>
@@ -1499,6 +1493,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Остали корисници"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Меморија уређаја"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Преносна меморија"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Користи се <xliff:g id="USED">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"од укупно <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1761,11 +1765,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ниједна апликација није недавно приступила локацији"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Велика потрошња батерије"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Мала потрошња батерије"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi и Bluetooth скенирају"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi скенирање"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволите апликацијама и услугама да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скенирање"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуге локације за посао"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временске зоне локације"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временске зоне локације"</string>
@@ -2168,7 +2173,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Можете да прилагодите овај уређај према потребама. Те функције приступачности можете касније да промените у Подешавањима."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Промените величину фонта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи екрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Звук и текст на екрану"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Титл"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Звук"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и приказ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затамњује екран"</string>
@@ -2322,7 +2330,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Плаво-жуто"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Смањите осветљеност"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Затамните екран више од минималне осветљености телефона"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Затамните екран више од минималне осветљености таблета"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затамните екран да би вам читање било пријатније.&lt;br/&gt;&lt;br/&gt; То може да вам буде корисно: &lt;ol&gt; &lt;li&gt; када је подразумевана минимална осветљеност телефона и даље јака&lt;/li&gt; &lt;li&gt; када користите телефон у мраку, на пример, ноћу или у тамно соби пре одласка на спавање&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3548,9 +3557,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодије звона"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звукови и вибрације"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Обавештења"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Конверзација"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Недавно послато"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Погледајте све из последњих 7 дана"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Напредна"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Опште"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Пословна обавештења"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Прилагодљива обавештења"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет прилагодљивог обавештења"</string>
@@ -3612,7 +3622,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи на клизном панелу, статусној траци и закључаном екрану"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сакриј нечујна обавештења на статусној траци"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Укључи треперење лампице"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Обавештења на закључаном екрану"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Приватност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескочи закључан екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"После откључавања лицем иди директно на последњи екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"закључани екран, прескочити, заобићи"</string>
@@ -3728,13 +3738,14 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Обавештења за конверзацију"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Звучна обавештења"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Нечујна обавештења"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Апликације које нису премошћене за овог слушаоца"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Све апликације су премошћене"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d апликација није премошћена</item>
+      <item quantity="few">%d апликације нису премошћене</item>
+      <item quantity="other">%d апликација није премошћено</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Премошћене апл."</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Услуге помагача за виртуелну реалност"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниједна инсталирана апликација није захтевала да се покрене као услуга помагача за виртуелну реалност."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Желите ли да дозволите приступ услузи виртуелне реалности за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4415,7 +4426,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничења</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Обрачун података код мобилног оператера се можда разликује од обрачуна уређаја."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не обухвата податке које користе мреже мобилних оператера"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Не обухвата податке које користе мреже мобилних оператера"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Подеси упозорење о подацима"</string>
     <string name="data_warning" msgid="2925054658166062884">"Упозорење за потрошњу података"</string>
@@ -4973,7 +4984,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Промена режима рада мреже"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Жељени тип мреже"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Мобилни оператер"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Верзија подешавања"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Позивање"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видео позивање преко оператера"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избор система"</string>
@@ -5022,6 +5034,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Уклоните SIM картицу, па је ставите поново. Ако се проблем и даље јавља, рестартујте уређај."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Пробајте поново да укључите SIM картицу. Ако се проблем и даље јавља, рестартујте уређај."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активација мреже"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Прелазак на другог мобилног оператера"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Мобилни оператер <xliff:g id="CARRIER_NAME">%1$s</xliff:g> је активан"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Додирните да бисте ажурирали подешавања SIM-а"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Прешли сте на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5199,7 +5212,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено је недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM картице"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Подешавања"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Подешавања мреже"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Повежите се са јавним мрежама"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна веза, интернет, бежично, подаци, wifi, wi-fi, wi fi, мобилни телефон, мобилни, мобилни оператер, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи мреже за режим рада у авиону"</string>
@@ -5213,7 +5226,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Реши проблем са повезивањем"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Доступне су мреже за режим рада у авиону"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Да бисте променили мрежу, прекините етернет везу"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не можете да промените мрежу док сте повезани"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мреже у режиму рада у авиону"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Повезано"</string>
@@ -5248,4 +5260,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Унесите број телефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Није наведен број телефона."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Потврди"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволите 2G"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b6f4822..4f6d0ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gör texten på skärmen större eller mindre."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Förminska"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Förstora"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Använd automatiskt rotation"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Den främre kameran används i ansiktsbaserad automatisk rotation för att avgöra hur någon tittar på skärmen. Det innebär att du kan läsa när du ligger ned. Bilder lagras aldrig och skickas inte till Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Läs mer&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exempeltext"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Den fantastiska trollkarlen från Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapitel 11: Den underbara Smaragdstaden i Oz"</string>
@@ -409,8 +407,8 @@
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Använda ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Tryck på fingeravtryckssensorn när du vill låsa upp telefonen, auktorisera köp eller logga in i appar. Var försiktig med vems fingeravtryck du lägger till eftersom alla som du lägger till kan utföra alla dessa åtgärder."</string>
     <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tack"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsätt"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Sök"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skärm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotera skärmen automatiskt"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Av"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"På"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"På – ansiktsbaserad"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivera ansiktsidentifiering"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Färger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturliga"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Förstärkta"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andra användare"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagring på enhet"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bärbar lagringsenhet"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g> används"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"av <xliff:g id="TOTAL">%1$s</xliff:g> används"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Inga appar har nyligen använt din plats"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hög batterianvändning"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Låg batterianvändning"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Platssökning med Wi‑Fi och Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-sökning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Tillåt att appar och tjänster söker efter Wi‑Fi-nätverk när som helst, även när Wi‑Fi är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-sökning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillåt att appar och tjänster söker efter enheter i närheten när som helst, även när Bluetooth är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Platstjänster för jobbet"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Identifiering av tidszon utifrån plats"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Identifiering av tidszon utifrån plats"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ändra teckenstorlek"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skärmläsningsprogram"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ljud och text på skärmen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Textning"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ljud"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Skärm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text och visning"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gör skärmen mörkare"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Röd–grön"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Röd–grön"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Gul–blå"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Minska ljusstyrkan"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gör skärmen mörkare än telefonens lägsta ljusstyrka"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gör skärmen mörkare än surfplattans lägsta ljusstyrka"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gör skärmen mörkare så att det blir behagligare att läsa.&lt;br/&gt;&lt;br/&gt; Detta kan vara användbart när &lt;ol&gt; &lt;li&gt; telefonens lägsta ljusstyrka fortfarande är för ljus&lt;/li&gt; &lt;li&gt; du använder telefonen i mörker, t.ex. på natten eller i ett mörkt rum innan du ska sova.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringsignaler"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andra ljud och vibrationer"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Aviseringar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nyligen skickat"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Visa alla för de senaste sju dagarna"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avancerat"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Allmänt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Jobbaviseringar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Anpassade aviseringar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritet för anpassad avisering"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Visa på aviseringspanelen, i statusfältet och på låsskärmen."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Dölj tysta aviseringar i statusfältet"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkande ljus"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Aviseringar på låsskärmen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Integritet"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hoppa över låsskärmen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Öppna den senast använda skärmen när ansiktslåset låses upp"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låsskärm, Hoppa över, Kringgå"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Aviseringar om konversationer"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Aviseringar med vibrationer eller ljud"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Ljudlösa aviseringar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Appar som inte är bryggade till denna lyssnare"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Alla appar är bryggade"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d appar är inte bryggade</item>
+      <item quantity="one">%d app är inte bryggad</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Bryggade appar"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjälptjänster för VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Inga installerade appar har begärt att få köras som hjälptjänster för VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vill du tillåta att tjänsten för VR får tillgång till <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 begränsning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Data som används via operatörer utesluts"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Data som används via operatörer utesluts"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ställ in en datavarning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavarning"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ändra nätverksläge"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Önskad nätverkstyp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatör"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version av inställningarna"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Ringer upp"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videosamtal via operatören"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemval"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ta ut SIM-kortet och sätt i det igen. Starta om enheten om problemet kvarstår."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Testa att aktivera SIM-kortet igen. Starta om enheten om problemet kvarstår."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Nätverksaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatörsbyte"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> är aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryck för att uppdatera SIM-inställningarna"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Du har bytt till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"otillgängligt"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Inte tillgängligt just nu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Inget SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Inställningar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nätverksinställningar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Anslut till offentliga nätverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nätverksanslutning, internet, trådlös, data, wifi, wi-fi, wi fi, mobil, telefon, mobiloperatör, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visa nätverk med flygplansläge"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Åtgärda anslutning"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nätverk för flygplansläge är tillgängliga"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Koppla bort Ethernet för att byta nätverk"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Det går inte att växla nätverk när du är ansluten"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nätverk för flygplansläge"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ansluten"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ange telefonnummer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer saknas."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillåt 2G"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d6202cc..5acdc05 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Watumiaji wengine"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Hifadhi ya kifaa"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hifadhi inayohamishika"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> kati ya <xliff:g id="TOTAL">%2$s</xliff:g> zimetumika"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Iliyotumika kati ya <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Hakuna programu iliyofikia mahali hivi karibuni"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Matumizi ya betri ya hali ya juu"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Huwa haitumii chaji nyingi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Utafutaji Wi‑Fi na Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Kutafuta Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Ruhusu programu na huduma zitafute mitandao ya Wi-Fi wakati wowote, hata wakati umezima Wi-Fi. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Kutafuta Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ruhusu programu na huduma zitafute vifaa vilivyo karibu wakati wowote, hata wakati umezima Bluetooth. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Huduma za Mahali za kazini"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Utambuzi wa saa za eneo"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Utambuzi wa saa za eneo"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Badilisha ukubwa wa fonti"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Visomaji skrini"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Maandishi kwenye skrini na sauti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Manukuu"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Sauti"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Skrini"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Maandishi na onyesho"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Geuza skrini iwe nyeusi"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bluu-manjano"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Punguza Ung\'aavu"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Fanya skrini iwe nyeusi kuliko kiwango cha chini cha ung\'aavu cha simu yako"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Fanya skrini iwe nyeusi kuliko kiwango cha chini cha ung\'aavu cha kompyuta yako kibao"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Fanya skrini yako iwe nyeusi kidogo ili uweze kusoma bila tatizo.&lt;br/&gt;&lt;br/&gt; Hali hii inaweza kuwa muhimu wakati: &lt;ol&gt; &lt;li&gt; Ung\'aavu chaguomsingi wa kiwango cha chini kwenye simu yako bado una mwangaza mkubwa&lt;/li&gt; &lt;li&gt; Unatumia simu yako katika hali zenye giza, kama vile usiku au katika chumba chenye giza kabla ya kulala&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Milio ya simu"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Mitetemo na sauti zingine"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Arifa"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Mazungumzo"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Zilizotumwa hivi majuzi"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Angalia zilizotumika katika siku 7 zilizopita"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Mipangilio ya kina"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Jumla"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Arifa za kazini"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Arifa zinazojirekebisha"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Kipaumbele cha arifa inayojirekebisha"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Onyesha katika orodha kunjuzi, sehemu ya arifa na kwenye skrini iliyofungwa"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ficha arifa zisizo na sauti katika sehemu ya arifa"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mwangaza umemeteke"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Arifa kwenye skrini iliyofungwa"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Faragha"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kuruka skrini iliyofungwa"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Ukishafungua kwa uso, nenda kwenye skrini iliyotumika mwisho"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrini iliyofungwa, Kufunga skrini, Ruka, Kwepa"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Arifa za mazungumzo"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Arifa za tahadhari"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Arifa zisizo na sauti"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Programu ambazo hazijaunganishwa kwa ajili ya msikilizaji huyu"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Programu zote zimeunganishwa"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">Programu %d hazijaunganishwa</item>
+      <item quantity="one">Programu %d haijaunganishwa</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Programu zilizounganishwa"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Huduma za kisaidizi cha Uhalisia Pepe"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hakuna programu zilizosakinishwa ambazo zinaweza kutekeleza huduma za kisaidizi cha Uhalisia Pepe."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Ungependa kuruhusu huduma za Uhalisia Pepe katika <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">Kizuizi 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Huenda hesabu ya data ya mtoa huduma ikawa tofauti na ya kifaa chako"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Haijumuishi data inayotumiwa na mitandao ya mtoa huduma"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Haijumuishi data inayotumiwa na mitandao ya mtoa huduma"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Weka onyo la matumizi ya data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Onyo kuhusu data"</string>
@@ -4887,7 +4903,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Badilisha hali ya utendaji wa mtandao"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Aina ya mtandao inayopendelewa"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mtoa huduma"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Toleo la mipangilio"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Kupiga simu"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Kupiga simu ya video kupitia kampuni ya simu"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Chagua mfumo"</string>
@@ -4936,6 +4953,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ondoa SIM na uiweke tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Jaribu kuwasha SIM tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kuwasha mtandao"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Inabadilisha mtoa huduma"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Unatumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Gusa ili usasishe mipangilio ya SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Sasa unatumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5111,7 +5129,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"haipatikani"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Haipatikani kwa muda"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Hakuna SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mapendeleo"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mapendeleo ya mtandao"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Unganisha kwenye mitandao ya umma"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"muunganisho wa mtandao, intaneti, isiyotumia waya, data, wifi, wi-fi, wi fi, mtandao wa simu, vifaa vya mkononi, mtoa huduma za vifaa vya mkononi, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Angalia mitandao ya hali ya ndegeni"</string>
@@ -5125,7 +5143,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Rekebisha hitilafu ya muunganisho"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Mitandao inayotumika katika hali ya ndegeni inapatikana"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ili kubadili mitandao, tenganisha ethaneti"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Haiwezi kubadili mitandao wakati imeunganishwa"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mitandao ya hali ya ndegeni"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Imeunganishwa"</string>
@@ -5160,4 +5177,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Weka Nambari ya simu"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nambari ya simu haipo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Sawa"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Ruhusu 2G"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3d4fe11..e09c049 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"திரையில் காட்டப்படும் உரையைச் சிறிதாக்கும் அல்லது பெரிதாக்கும்."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"சிறிதாக்கு"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"பெரிதாக்கு"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"தானாகச் சுழற்றுதல் அமைப்பைப் பயன்படுத்து"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"திரையை ஒருவர் பார்க்கிறாரா, எப்படிப் பார்க்கிறார் என்பனவற்றைக் கண்டறிய, முகம் அடிப்படையிலான \'தானாகச் சுழற்றுதல்\' அமைப்பானது முன்பக்கக் கேமராவைப் பயன்படுத்தும். இது படுத்துக்கொண்டே படிக்க அனுமதிக்கும். படங்களைச் சேமிக்கவோ அவற்றை Googleளுக்கு அனுப்பவோ ஒருபோதும் அனுமதிக்காது.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;மேலும் அறிக&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"மாதிரி உரை"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"தி விசார்ட் ஆஃப் ஓஸ்"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"அத்தியாயம் 11: ஓஸின் அற்புதமான மரகத நகரம்"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"தேடு"</string>
     <string name="display_settings" msgid="7197750639709493852">"திரை அமைப்பு"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"திரையைத் தானாகச் சுழற்று"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ஆஃப்"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ஆன்"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ஆன் - முகம் அடிப்படையிலானது"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"முகம் கண்டறிதல் அமைப்பை இயக்கு"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"வண்ணங்கள்"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"இயற்கை வண்ணம்"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"பூஸ்ட் செய்யப்பட்டது"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"பிற பயனர்கள்"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"சாதனச் சேமிப்பகம்"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"கையடக்கச் சேமிப்பகம்"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"பயன்படுத்தியது: <xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"பயன்படுத்தியது: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"சமீபத்தில் எந்த ஆப்ஸும் இருப்பிடத்தை அணுகவில்லை"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"அதிகப் பேட்டரி பயன்பாடு"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"குறைவான பேட்டரி பயன்பாடு"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"வைஃபை மற்றும் புளூடூத் மூலமாக ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"வைஃபை ஸ்கேனிங்"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"வைஃபை ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் வைஃபை நெட்வொர்க்குகளைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"புளூடூத் ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"பணிக் கணக்கிற்கான இருப்பிடச் சேவைகள்"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைப் பிரத்தியேகமாக்கலாம். பின்னர் அணுகுமுறை அம்சங்களை, அமைப்புகளில் மாற்றி கொள்ளலாம்"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"எழுத்தின் அளவை மாற்று"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"திரைப் படிப்பான்கள்"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"வசனங்கள்"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ஆடியோ"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"திரை அமைப்பு"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"உரை மற்றும் காட்சி"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"திரையின் ஒளிர்வைக் குறைத்தல்"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"நீலம்-மஞ்சள்"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ஒளிர்வைக் குறைத்தல்"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"உங்கள் மொபைலின் குறைந்தபட்ச ஒளிர்வை விடவும் திரையின் ஒளிர்வை இன்னும் குறைக்கலாம்"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"உங்கள் டேப்லெட்டின் குறைந்தபட்ச ஒளிர்வை விடவும் திரையின் ஒளிர்வை இன்னும் குறைக்கலாம்"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"திரையில் உள்ளவற்றை எளிதாக வாசிக்க அதன் ஒளிர்வைக் குறையுங்கள்.&lt;br/&gt;&lt;br/&gt; பின்வரும் தருணங்களில் இது உதவிகரமானதாக இருக்கும்: &lt;ol&gt; &lt;li&gt; மொபைலின் குறைந்தபட்ச இயல்புநிலை ஒளிர்வே மிகவும் வெளிச்சமானதாக இருக்கும்போது&lt;/li&gt; &lt;li&gt; இரவுநேரம், இருட்டான அறை போன்ற இருள் சூழ்ந்த தருணங்களில் மொபைலைப் பயன்படுத்தும்போது&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ரிங்டோன்கள்"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"பிற ஒலிகள் மற்றும் அதிர்வுகள்"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"அறிவிப்புகள்"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"உரையாடல்"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"சமீபத்தில் அனுப்பியவை"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"கடந்த 7 நாட்களில் உள்ள அனைத்தையும் காட்டு"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"மேம்பட்டவை"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"பொது"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"பணி அறிவிப்புகள்"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"சூழலுக்கேற்ற அறிவிப்புகள்"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"சூழலுக்கேற்ற அறிவிப்புக்கான முன்னுரிமை"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"கீழ் இழுக்கும் ஷேட், நிலைப்பட்டி &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"நிலைப் பட்டியில் ஒலியில்லாத அறிவிப்புகளை மறை"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ஒளியைச் சிமிட்டு"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"பூட்டுத்திரையில் அறிவிப்புகள்"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"தனியுரிமை"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"பூட்டுத் திரையைத் தவிர்த்தல்"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"முகம் காட்டித் திறந்ததும் கடைசியாக பார்த்த திரைக்கு செல்லும்"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"பூட்டுத் திரை, பூட்டுத்திரை, தவிர், தவிர்த்துச் செல்"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"உரையாடல் அறிவிப்புகள்"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"விழிப்பூட்டல் அறிவிப்புகள்"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"ஒலியில்லாத அறிவிப்புகள்"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"அறிவிப்புகளைக் கண்காணிக்கும் இச்சேவையுடன் இணைக்கப்படாத ஆப்ஸ்"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"அனைத்து ஆப்ஸும் இணைக்கப்பட்டன"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d ஆப்ஸ் இணைக்கப்படவில்லை</item>
+      <item quantity="one">%d ஆப்ஸ் இணைக்கப்படவில்லை</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"இணைக்கப்பட்ட ஆப்ஸ்"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR உதவிச் சேவைகள்"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR உதவிச் சேவைகளாக இயங்குவதற்காகக் கோரிய ஆப்ஸ் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ அணுக VR சேவையை அனுமதிக்கவா?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 கட்டுப்பாடு</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"மொபைல் நிறுவன நெட்வொர்க்குகள் மூலம் பயன்படுத்திய டேட்டா தவிர்த்து"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"மொபைல் நிறுவன நெட்வொர்க்குகள் பயன்படுத்திய டேட்டா அளவு சேர்க்கப்படவில்லை"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
     <string name="data_warning" msgid="2925054658166062884">"டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"நெட்வொர்க் இயங்கும் பயன்முறையை மாற்று"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"விருப்பமான நெட்வொர்க் வகை"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"மொபைல் நிறுவனம்"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"அமைப்புகளின் பதிப்பு"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"அழைப்பு"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"மொபைல் நிறுவன வீடியோ அழைப்பு"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"சிஸ்டம் தேர்வு"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"சிம்மை அகற்றிவிட்டு மீண்டும் செருகவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"சிம்மை மீண்டும் ஆன் செய்து பார்க்கவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"மொபைல் நெட்வொர்க்கை இயக்குதல்"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"மொபைல் நிறுவனத்தை மாற்றுகிறது"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> செயல்பாட்டில் உள்ளது"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM அமைப்புகளை மாற்ற தட்டவும்"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றப்பட்டது"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"அழைப்புகள்/மெசேஜ் செய்ய முடியாது"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"தற்காலிகமாகக் கிடைக்கவில்லை"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"சிம் இல்லை"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"விருப்பத்தேர்வுகள்"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"நெட்வொர்க் விருப்பத்தேர்வுகள்"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"பொது நெட்வொர்க்குகளுடன் இணைக்கலாம்"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வைஃபை, வை-ஃபை, வை ஃபை, செல்லுலார், மொபைல், செல் கேரியர், 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"விமானப் பயன்முறை நெட்வொர்க்குகளை காட்டு"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"இணைப்புநிலையைச் சரிசெய்"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"விமானப் பயன்முறை நெட்வொர்க்குகள் கிடைக்கின்றன"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"நெட்வொர்க்குகளை மாற்ற ஈதர்நெட் இணைப்பைத் துண்டிக்கவும்"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"இணைப்பில் இருக்கும்போது நெட்வொர்க்குகளை மாற்ற முடியாது"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"விமானப் பயன்முறை நெட்வொர்க்குகள்"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"இணைக்கப்பட்டது"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"மொபைல் எண்ணை உள்ளிடுக"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"மொபைல் எண் உள்ளிடப்படவில்லை."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"சரி"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G சேவையை அனுமதி"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 231a6fe..8ba2fb5 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"స్క్రీన్‌పై ఉండే వచనాన్ని చిన్నదిగా లేదా పెద్దదిగా చేస్తుంది."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"చిన్నదిగా చేస్తుంది"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"పెద్దదిగా చేస్తుంది"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ఆటో-రొటేట్‌ను ఉపయోగించండి"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ఎవరైనా స్క్రీన్‌ను ఎలా చూస్తున్నారో చూడటానికి ముఖం ఆధారం ఆటోరోటేట్ ముందు కెమెరాను ఉపయోగిస్తుంది. ఇది పడుకున్నప్పుడు చదవడానికి అనుమతిస్తుంది, ఇమేజ్‌లు ఎప్పుడూ స్టోర్ చేయబడవు లేదా Googleకు పంపబడవు.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;మరింత తెలుసుకోండి&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"నమూనా వచనం"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ది వండర్‌ఫుల్ విజర్డ్ ఆఫ్ ఆజ్"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"అధ్యాయం 11: ది వండర్‌ఫుల్ ఎమరాల్డ్ సిటీ ఆఫ్ ఆజ్"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"సెర్చ్"</string>
     <string name="display_settings" msgid="7197750639709493852">"డిస్‌ప్లే"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"స్క్రీన్ ఆటో-రొటేట్‌"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ఆఫ్‌లో ఉంది"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ఆన్‌లో ఉంది"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"\'ముఖం ఆధారం\'ను ఆన్ చేయండి"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ముఖ గుర్తింపును ఎనేబుల్ చేయండి"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"రంగులు"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"సహజం"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"మెరుగుపరిచినవి"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ఇతర వినియోగదారులు"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"పరికర నిల్వ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"పోర్టబుల్ నిల్వ"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>లో <xliff:g id="USED">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించినది"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"యాప్‌లు ఏవీ స్థానాన్ని ఇటీవల యాక్సెస్ చేయలేదు"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"అధిక బ్యాటరీ వినియోగం"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"తక్కువ బ్యాటరీ వినియోగం"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi, బ్లూటూత్‌ స్కానింగ్‌"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi ఆఫ్‌లో ఉన్నా కూడా, ఏ సమయంలోనైనా Wi‑Fi నెట్‌‍వర్క్‌లను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"బ్లూటూత్ స్కానింగ్"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ఆఫీస్ కోసం స్థాన సేవలు"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ ఫీచర్‌లను సెట్టింగ్‌లలో తర్వాత మార్చవచ్చు."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ఫాంట్ పరిమాణాన్ని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"స్క్రీన్ రీడర్‌లు"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో &amp; స్క్రీన్‌పై ఉండే టెక్స్ట్"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"క్యాప్షన్‌లు"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ఆడియో"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"డిస్‌ప్లే"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"టెక్స్ట్, డిస్‌ప్లే"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"స్క్రీన్‌ను ముదురు రంగులో కనిపించేలా చేయండి"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"నీలం-పసుపు"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ప్రకాశాన్ని తగ్గించండి"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"మీ ఫోన్ కనీస ప్రకాశం కంటే స్క్రీన్‌ను ముదురు రంగులో ఉంచండి"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"మీ టాబ్లెట్ కనీస ప్రకాశం కంటే స్క్రీన్‌ను ముదురు రంగులో ఉంచండి"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"మీ స్క్రీన్‌ను ముదురు రంగులో ఉంచండి, తద్వారా చదవడానికి మరింత సౌకర్యంగా ఉంటుంది.&lt;br/&gt;&lt;br/&gt; ఇది ఈ విషయాలలో సహాయపడుతుంది: &lt;ol&gt; &lt;li&gt; మీ ఫోన్ ఆటోమేటిక్ సెట్టింగ్ కనీస ప్రకాశం ఇప్పటికీ చాలా ప్రకాశవంతంగా ఉన్నప్పుడు&lt;/li&gt; &lt;li&gt; రాత్రిపూట లేదా నిద్రపోయే ముందు రూమ్‌లో ఉండేటటువంటి చీకటి పరిస్థితులలో మీరు మీ ఫోన్‌ను ఉపయోగిస్తున్నప్పుడు&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"రింగ్‌టోన్‌లు"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ఇతర ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"నోటిఫికేషన్‌లు"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"సంభాషణ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ఇటీవల పంపినవి"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"గత 7 రోజుల నుండి అన్నింటినీ చూడండి"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"అధునాతన సెట్టింగ్‌లు"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"సాధారణం"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"కార్యాలయ నోటిఫికేషన్‌లు"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"అనుకూల నోటిఫికేషన్‌లు"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"అనుకూల నోటిఫికేషన్ ప్రాధాన్యత"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"కిందకు-లాగే షేడ్, స్థితి పట్టీ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శింపబడుతుంది"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"స్టేటస్ బార్‌లో నిశ్శబ్ద నోటిఫికేషన్‌లను దాచు"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"లాక్‌స్క్రీన్‌లో నోటిఫికేషన్స్"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"గోప్యత"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"లాక్ స్క్రీన్‌ను దాటవేయి"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ఫేస్ అన్‌లాక్ చేశాక చివరిసారి ఉపయోగించిన స్క్రీన్‌కు తీసుకువెళుతుంది"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"లాక్ స్క్రీన్, లాక్ స్క్రీన్, దాటవేయి, బైపాస్"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"సంభాషణ నోటిఫికేషన్‌లు"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"అలర్ట్ చేసే నోటిఫికేషన్‌లు"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"నిశ్శబ్ద నోటిఫికేషన్‌లు"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ఈ యూజర్ కోసం బ్రిడ్జ్ చేయబడని యాప్‌లు"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"అన్ని యాప్‌లు బ్రిడ్జ్ చేయబడ్డాయి"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d యాప్‌లు బ్రిడ్జ్ చేయబడలేదు</item>
+      <item quantity="one">%d యాప్ బ్రిడ్జ్ చేయబడలేదు</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"బ్రిడ్జ్ చేసిన యాప్‌లు"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR సహాయక సేవలు"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ VR సహాయక సేవలుగా అమలు కావడానికి అభ్యర్థించబడలేదు."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం VR సేవ ప్రాప్యతను అనుమతించాలా?"</string>
@@ -3831,9 +3841,9 @@
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
     <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ఏవీ లేవు}=1{{contact_1}}=2{{contact_1}, {contact_2}}=3{{contact_1}, {contact_2}, {contact_3}}other{{contact_1}, {contact_2}, # మంది ఇతరులు}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(పేరు లేదు)"</string>
-    <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
+    <string name="zen_mode_messages" msgid="7315084748885170585">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"మెసేజ్‌లు"</string>
-    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
+    <string name="zen_mode_messages_title" msgid="1777598523485334405">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"అంతరాయం కలిగించగల మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_footer" msgid="6002468050854126331">"అనుమతించిన మెసేజ్‌లు వచ్చినప్పుడు శబ్దం వస్తుందని నిర్ధారించుకోవడానికి, పరికరం రింగ్ మోడ్‌లో ఉందో లేదో చెక్ చేయండి"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’కి సంబంధించిన ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
@@ -4350,7 +4360,7 @@
       <item quantity="one">1 పరిమితి</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"క్యారియర్ డేటా గణన మరియు పరికర డేటా గణన మధ్య తేడా ఉండవచ్చు"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"క్యారియర్ నెట్‌వర్క్‌ల ద్వారా వినియోగించబడిన డేటా మినహాయించబడుతుంది"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"క్యారియర్ నెట్‌వర్క్‌ల ద్వారా వినియోగించబడిన డేటా మినహాయించబడుతుంది"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"డేటా హెచ్చరికను సెట్ చేయండి"</string>
     <string name="data_warning" msgid="2925054658166062884">"డేటా హెచ్చరిక"</string>
@@ -4894,7 +4904,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"నెట్‌వర్క్ ఆపరేటింగ్ మోడ్‌ను మార్చండి"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ప్రాధాన్యత గల నెట్‌వర్క్ రకం"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"క్యారియర్"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"సెట్టింగ్‌ల వెర్షన్"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"కాల్ చేయడం"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"క్యారియర్ వీడియో కాలింగ్"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"సిస్టమ్ ఎంపిక"</string>
@@ -4943,6 +4954,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్‌సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMను తిరిగి ఆన్ చేయడానికి ట్రై చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"నెట్‌వర్క్ యాక్టివేషన్"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"క్యారియర్‌ మారుతోంది"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> యాక్టివ్‌గా ఉంది"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM సెట్టింగ్‌లను అప్‌డేట్ చేయడానికి ట్యాప్ చేయండి"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కి మార్చబడింది"</string>
@@ -5118,7 +5130,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"అందుబాటులో లేదు"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"తాత్కాలికంగా అందుబాటులో లేదు"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"సిమ్ లేదు"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ప్రాధాన్యతలు"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"నెట్‌వర్క్ ప్రాధాన్యతలు"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"పబ్లిక్ నెట్‌వర్క్‌లకు కనెక్ట్ అవ్వండి"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"నెట్‌వర్క్ కనెక్షన్, ఇంటర్‌నెట్, వైర్‌లెస్, డేటా, Wi-Fi, Wi-Fi, Wi-Fi, సెల్యూలార్, మొబైల్, సెల్ క్యారియర్, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"విమానం మోడ్ నెట్‌వర్క్‌లను చూడండి"</string>
@@ -5132,7 +5144,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"కనెక్టివిటీని సరిచేయి"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"విమానం మోడ్ నెట్‌వర్క్‌లు అందుబాటులో ఉన్నాయి"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"నెట్‌వర్క్‌లను మార్చడానికి, ఈథర్‌నెట్‌ను డిస్‌కనెక్ట్ చేయండి"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"కనెక్ట్ అయి ఉన్నప్పుడు నెట్‌వర్క్‌లను మార్చలేరు"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"విమానం మోడ్ నెట్‌వర్క్‌లు"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"కనెక్ట్ చేయబడింది"</string>
@@ -5167,4 +5178,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ఫోన్ నంబర్‌ను ఎంటర్ చేయండి"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ఫోన్ నంబర్ లేదు."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"సరే"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gని అనుమతించండి"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a1bfe26..af7172c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ปรับขนาดข้อความบนหน้าจอให้เล็กลงหรือใหญ่ขึ้น"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ทำให้เล็กลง"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ทำให้ใหญ่ขึ้น"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ใช้การหมุนอัตโนมัติ"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"การหมุนอัตโนมัติตามใบหน้าจะใช้กล้องหน้าเพื่อดูว่าผู้ใช้กำลังดูหน้าจออยู่หรือไม่และดูในลักษณะใด ซึ่งทำให้คุณอ่านในขณะเอนตัวนอนได้และจะไม่มีการจัดเก็บหรือส่งรูปภาพไปยัง Google&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ดูข้อมูลเพิ่มเติม&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ข้อความตัวอย่าง"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"พ่อมดมหัศจรรย์แห่งออซ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"บทที่ 11: เมืองมรกตมหัศจรรย์แห่งออซ"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ค้นหา"</string>
     <string name="display_settings" msgid="7197750639709493852">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"หมุนหน้าจออัตโนมัติ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ปิด"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"เปิด"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"เปิด - ตามใบหน้า"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"เปิดใช้การตรวจจับใบหน้า"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"สี"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ธรรมชาติ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"บูสต์"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ผู้ใช้รายอื่นๆ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ที่เก็บข้อมูลอุปกรณ์"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ที่จัดเก็บข้อมูลแบบพกพา"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"ใช้ไป <xliff:g id="USED">%1$s</xliff:g> จากทั้งหมด <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ไม่มีแอปที่เข้าถึงตำแหน่งเมื่อเร็วๆ นี้"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ใช้แบตเตอรี่มาก"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ใช้แบตเตอรี่น้อย"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"การสแกนหา Wi‑Fi และบลูทูธ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"การสแกนหา Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"อนุญาตให้แอปและบริการต่างๆ สแกนหาเครือข่าย Wi‑Fi ตลอดเวลาแม้ Wi‑Fi จะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"การสแกนหาบลูทูธ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"บริการตำแหน่งสำหรับการทำงาน"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"การตรวจหาเขตเวลาของสถานที่"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"การตรวจหาเขตเวลาของสถานที่"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"คุณปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการได้ และเปลี่ยนฟีเจอร์การช่วยเหลือพิเศษเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"โปรแกรมอ่านหน้าจอ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"เสียงและข้อความบนหน้าจอ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"คำบรรยายวิดีโอ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"เสียง"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"การแสดงผล"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ข้อความและจอแสดงผล"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ปรับแสงหน้าจอให้มืดลง"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"สีน้ำเงิน/เหลือง"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ลดความสว่าง"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ปรับแสงหน้าจอให้มืดกว่าความสว่างต่ำสุดของโทรศัพท์"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ปรับแสงหน้าจอให้มืดกว่าความสว่างต่ำสุดของแท็บเล็ต"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ปรับแสงหน้าจอให้มืดลงเพื่อให้อ่านได้สบายตายิ่งขึ้น&lt;br/&gt;&lt;br/&gt; ฟีเจอร์นี้จะเป็นประโยชน์เมื่อ &lt;ol&gt; &lt;li&gt; ความสว่างต่ำสุดเริ่มต้นของโทรศัพท์ยังคงสว่างเกินไป&lt;/li&gt; &lt;li&gt; คุณกำลังใช้โทรศัพท์ในสภาพแวดล้อมที่มืด เช่น ในเวลากลางคืนหรือก่อนเข้านอนในห้องที่มืด&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"เสียงเรียกเข้า"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"เสียงอื่นๆ และการสั่น"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"การแจ้งเตือน"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"การสนทนา"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ส่งล่าสุด"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ดูทั้งหมดในช่วง 7 วันล่าสุด"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ขั้นสูง"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ทั่วไป"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"การแจ้งเตือนงาน"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"การแจ้งเตือนแบบปรับอัตโนมัติ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ลำดับความสำคัญของการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"แสดงในหน้าต่างแบบเลื่อนลง แถบสถานะ และในหน้าจอล็อก"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ซ่อนการแจ้งเตือนที่ปิดเสียงในแถบสถานะ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ไฟกะพริบ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"การแจ้งเตือนบนหน้าจอล็อก"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ความเป็นส่วนตัว"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ข้ามหน้าจอล็อก"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ไปที่หน้าจอที่ใช้ล่าสุดหลังปลดล็อกด้วยใบหน้า"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"หน้าจอล็อก, ข้าม, เลี่ยง"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"การแจ้งเตือนการสนทนา"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"การแจ้งเตือนแบบส่งเสียง"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"การแจ้งเตือนแบบไม่มีเสียง"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"แอปที่ไม่ได้เชื่อมต่อกับ Listener นี้"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"ทุกแอปเชื่อมต่อแล้ว"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">มี %d แอปไม่ได้เชื่อมต่อ</item>
+      <item quantity="one">มี %d แอปไม่ได้เชื่อมต่อ</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"แอปที่เชื่อมต่อ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"บริการตัวช่วย VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"แอปที่ติดตั้งอยู่ไม่ได้ขอให้เรียกใช้เป็นบริการตัวช่วย VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"อนุญาตให้ <xliff:g id="SERVICE">%1$s</xliff:g> เข้าถึงบริการ VR ไหม"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">ข้อจำกัด 1 ข้อ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"การบันทึกการใช้อินเทอร์เน็ตของผู้ให้บริการอาจแตกต่างไปจากการบันทึกในอุปกรณ์"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ไม่รวมอินเทอร์เน็ตที่ใช้โดยเครือข่ายผู้ให้บริการ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ไม่รวมอินเทอร์เน็ตที่ใช้โดยเครือข่ายผู้ให้บริการ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ตั้งค่าเตือนการใช้อินเทอร์เน็ต"</string>
     <string name="data_warning" msgid="2925054658166062884">"เตือนปริมาณอินเทอร์เน็ต"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ประเภทเครือข่ายที่ต้องการ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ผู้ให้บริการ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"เวอร์ชันการตั้งค่า"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"การโทร"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"วิดีโอคอลผ่านผู้ให้บริการ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"การเลือกระบบ"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ถอดซิมออกแล้วใส่กลับเข้าไปอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ลองเปิดใช้ซิมอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"การเปิดใช้งานเครือข่าย"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"การเปลี่ยนผู้ให้บริการ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช้งานอยู่"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"แตะเพื่ออัปเดตการตั้งค่าซิม"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"เปลี่ยนไปใช้ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> แล้ว"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ไม่ว่าง"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ไม่พร้อมใช้งานชั่วคราว"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ไม่มีซิม"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ค่ากำหนด"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"การตั้งค่าเครือข่าย"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"เชื่อมต่อเครือข่ายสาธารณะ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, อินเทอร์เน็ตมือถือ, wifi, wi-fi, wi fi, เครือข่ายมือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการเครือข่ายมือถือ, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ดูเครือข่ายที่ใช้โหมดบนเครื่องบินได้"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"แก้ไขการเชื่อมต่อ"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"มีเครือข่ายที่ใช้งานได้ในโหมดบนเครื่องบิน"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ตัดการเชื่อมต่ออีเทอร์เน็ตเพื่อสลับเครือข่าย"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"สลับเครือข่ายขณะที่เชื่อมต่ออยู่ไม่ได้"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"เครือข่ายสำหรับโหมดบนเครื่องบิน"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"เชื่อมต่อแล้ว"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ป้อนหมายเลขโทรศัพท์"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ไม่มีหมายเลขโทรศัพท์"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ตกลง"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"อนุญาตให้ใช้ 2G"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5c09c1c..9a02bcd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Iba pang mga user"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Storage ng device"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable na storage"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ang nagamit sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Nagamit sa <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Walang app na nag-access ng lokasyon kamakailan"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mataas na paggamit ng baterya"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mababang paggamit ng baterya"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pag-scan ng Wi‑Fi at Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pag-scan ng Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Payagan ang mga app at serbisyo na mag-scan ng mga Wi-Fi network anumang oras, kahit na naka-off ang Wi-Fi. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pag-scan ng Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Payagan ang mga app at serbisyo na mag-scan ng mga kalapit na device anumang oras, kahit na naka-off ang Bluetooth. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Mga serbisyo ng lokasyon para sa trabaho"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pag-detect ng time zone gamit ang lokasyon"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pag-detect ng time zone gamit ang lokasyon"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Maaari mong i-customize ang device na ito upang maging angkop sa iyong mga pangangailangan. Maaaring baguhin ang mga feature sa accessibility na ito sa ibang pagkakataon sa Mga Setting."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Baguhin ang laki ng font"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Mga screen reader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio at text sa screen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Mga Caption"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text at display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gawing mas madilim ang screen"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Pula-berde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Pula-berde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Asul-dilaw"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Bawasan ang Liwanag"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gawing mas madilim ang screen kaysa sa minimum na liwanag ng iyong telepono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gawing mas madilim ang screen kaysa sa minimum na liwanag ng iyong tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gawing mas madilim ang iyong screen para maging mas kumportableng magbasa.&lt;br/&gt;&lt;br/&gt; Puwede itong makatulong kapag: &lt;ol&gt; &lt;li&gt; Masyado pa ring maliwanag ang default na minimum na liwanag ng iyong telepono&lt;/li&gt; &lt;li&gt; Ginagamit mo ang iyong telepono sa madidilim na sitwasyon, gaya ng kapag gabi o sa madilim na kuwarto bago matulog&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Mga Ringtone"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Iba pang tunog at pag-vibrate"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Mga Notification"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pag-uusap"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Naipadala kamakailan"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tingnan lahat mula sa nakalipas na 7 araw"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Pangkalahatan"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Mga notification sa trabaho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Mga adaptive na notification"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priyoridad ng adaptive na notification"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ipakita sa pull-down na shade, status bar, at lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Itago ang mga silent na notification sa status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Patay-sinding ilaw"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notification sa lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Laktawan ang lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pagka-face unlock, dumiretso sa huling ginamit na screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Laktawan, I-bypass"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Mga notification sa pag-uusap"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Mga nag-aalertong notification"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Mga silent na notification"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Mga app na hindi na-bridge sa listener na ito"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Na-bridge ang lahat ng app"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">Hindi na-bridge ang %d app</item>
+      <item quantity="other">Hindi na-bridge ang %d na app</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Mga na-bridge na app"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Mga serbisyong pantulong sa VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Walang mga naka-install na app ang humiling na mapagana bilang mga serbisyong pantulong sa VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Payagan ang access sa serbisyo ng VR para sa <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na paghihigpit</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Maaaring iba ang accounting ng data ng carrier kumpara sa accounting ng device"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Hindi kasama ang data na ginagamit ng mga carrier network"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Hindi kasama ang data na ginagamit ng mga carrier network"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Magtakda ng babala sa data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Babala sa paggamit ng data"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Baguhin ang network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Mas gustong network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Carrier"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Bersyon ng mga setting"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Pagtawag"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Pakikipag-video call gamit ang carrier"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pagpili ng system"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Alisin ang SIM at ilagay ito ulit. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Subukang i-on ulit ang SIM. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pag-activate ng network"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Pagpapalit ng carrier"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"I-tap para i-update ang mga setting ng SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"hindi available"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pansamantalang hindi available"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Walang SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mga Kagustuhan"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mga kagustuhan sa network"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kumonekta sa mga pampublikong network"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksyon ng network, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tingnan ang mga network sa airplane mode"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Ayusin ang pagkakonekta"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"May mga available na network sa airplane mode"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para lumipat ng network, idiskonekta ang ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Hindi makakalipat ng network habang nakakonekta"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mga network sa airplane mode"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Nakakonekta"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ilagay ang Numero ng telepono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Walang numero ng telepono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Payagan ang 2G"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0c68d4f..e5b71f4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1472,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Diğer kullanıcılar"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Cihazdaki depolama birimleri"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Taşınabilir depolama birimi"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>\'lık alanın <xliff:g id="USED">%1$s</xliff:g>\'ı kullanılıyor"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"kullanılıyor (Toplam: <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1733,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Yakın zamanda konum bilgilerine herhangi bir uygulama erişmedi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Düşük pil kullanımı"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Kablosuz ağ ve Bluetooth taraması"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Kablosuz ağ taraması"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Uygulamaların ve hizmetlerin kablosuz ağları Kablosuz özelliği kapalıyken bile her zaman taramasına izin verin. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth taraması"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Uygulamaların ve hizmetlerin etrafınızdaki cihazları Bluetooth kapalıyken bile her zaman taramasına izin verin. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş için konum hizmetleri"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Konum saat dilimini algılama"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Konum saat dilimini algılama"</string>
@@ -2138,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Yazı tipi boyutunu değiştir"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran okuyucular"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ses ve ekran metni"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Altyazılar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ses"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Metin ve görüntülü"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı koyulaştır"</string>
@@ -2291,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Parlaklığı Azalt"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ekranı, telefonunuzun minimum parlaklığından daha koyu yapın"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ekranı, tabletinizin minimum parlaklığından daha koyu yapın"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Daha rahat okuyabilmek için ekranınızı koyulaştırın.&lt;br/&gt;&lt;br/&gt; Bu özelliğin kullanışlı olacağı durumlar: &lt;ol&gt; &lt;li&gt; Telefonunuzun varsayılan minimum parlaklığı çok açık&lt;/li&gt; &lt;li&gt; Telefonunuzu gece veya uyumadan önce, karanlık bir oda gibi ışıksız ortamda kullanıyorsunuz&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3498,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zil sesleri"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Diğer sesler ve titreşimler"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirimler"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konuşma"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"En son gönderilenler"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Son 7 gün içinde kullanılan tüm uygulamaları göster"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Gelişmiş"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Genel"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"İş bildirimleri"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Uyarlanabilir bildirimler"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Uyarlamalı bildirim önceliği"</string>
@@ -3562,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılır gölgede, durum çubuğunda ve kilit ekranında gösterilir"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Durum çubuğunda sessiz bildirimleri gizle"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Işığı yakıp söndür"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kilit ekranındaki bildirimler"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Gizlilik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilit ekranını atla"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Yüz tanıma kilidinden sonra, doğrudan son kullanılan ekrana git"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Kilit ekranı, Kilitekranı, Atla, Geç"</string>
@@ -3674,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Görüşme bildirimleri"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Uyaran bildirimler"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Sessiz bildirimler"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Bu işleyici ile köprü modunda olmayan uygulamalar"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Tüm uygulamalar köprü modunda"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d uygulama köprü modunda değil</item>
+      <item quantity="one">%d uygulama köprü modunda değil</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Köprü modundaki uygulamalar"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR yardımcı hizmetleri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Yüklü hiçbir uygulamanın VR yardımcı hizmetleri olarak çalışması istenmedi."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> için VR hizmetine erişim izni verilsin mi?"</string>
@@ -4342,7 +4358,7 @@
       <item quantity="one">1 kısıtlama</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operatör ağları tarafından kullanılan verileri hariç tutar"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Operatör ağları tarafından kullanılan verileri hariç tut"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Veri uyarısı oluştur"</string>
     <string name="data_warning" msgid="2925054658166062884">"Veri uyarısı"</string>
@@ -4886,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ağın çalışma modunu değiştir"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tercih edilen ağ türü"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatör"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ayarlar sürümü"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Çağrı"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operatör görüntülü görüşmesi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistem seç"</string>
@@ -4935,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM\'i çıkarıp tekrar yerleştirmeyi deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM\'i tekrar açmayı deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ağ etkinleştirme"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatör değiştirme"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> etkin durumda"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını güncellemek için dokunun"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ağ türüne geçildi"</string>
@@ -5110,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"kullanılamıyor"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Geçici olarak kullanılamıyor"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kart yok"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tercihler"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ağ tercihleri"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Herkese açık ağlara bağlan"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ağ bağlantısı, internet, kablosuz, veri, wifi, wi-fi, wi fi, hücresel, mobil, hücresel operatör, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Uçak modu ağlarını göster"</string>
@@ -5124,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Sabit bağlantı"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Kullanılabilir uçak modu ağları"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ağ değiştirmek için ethernet bağlantısını kesin"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bağlı durumdayken ağ değiştirilemez"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Uçak modu ağları"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Bağlı"</string>
@@ -5159,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon numarası girin"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon numarası eksik."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Tamam"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G\'ye izin ver"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d225b4e..b8935cf 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,10 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Збільшуйте або зменшуйте текст на екрані."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Зменшити"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Збільшити"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Застосувати автообертання"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Функція автообертання за обличчям за допомогою камери на передній панелі визначає, чи дивиться користувач на екран і як саме. Завдяки цьому ви можете читати лежачи. Жодні зображення з камери не зберігаються й не передаються в Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Докладнішеlt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Зразок тексту"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чарівник країни Оз"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Глава 11. Дивовижне Смарагдове місто країни Оз"</string>
@@ -1216,14 +1214,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пошук"</string>
     <string name="display_settings" msgid="7197750639709493852">"Екран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автообертання екрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Вимкнути"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Увімкнути"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Увімкнути (за обличчям)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Увімкнути розпізнавання облич"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Кольори"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природні"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яскраві"</string>
@@ -1520,6 +1514,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Інші користувачі"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Пам’ять пристрою"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Портативний пристрій пам’яті"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Використовується <xliff:g id="USED">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Використовується з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1783,11 +1787,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Немає додатків, які нещодавно отримували доступ до геоданих"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Значне використання заряду"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Низьке використання заряду"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Пошук Wi‑Fi та Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Шукати мережі Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволити додаткам і сервісам будь-коли шукати мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Шукати пристрої Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Служби локації для роботи"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Визначення часового поясу за допомогою геолокації"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Визначення часового поясу за допомогою геолокації"</string>
@@ -2192,7 +2197,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Програми зчитування з екрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудіо й текст на екрані"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Cубтитри"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудіо"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Екран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст і відображення"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемняти екран"</string>
@@ -2347,7 +2355,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червоний – зелений"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червоний – зелений"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синій – жовтий"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Зменшувати яскравість"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Робити екран телефона темнішим, ніж передбачає мінімальний рівень яскравості"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Робити екран планшета темнішим, ніж передбачає мінімальний рівень яскравості"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Зменште яскравість екрана, щоб читати комфортніше.&lt;br/&gt;&lt;br/&gt; Ця функція корисна, коли: &lt;ol&gt; &lt;li&gt; встановлено мінімальне стандартне значення яскравості, але екран телефона все одно засвітлий;t&lt;/li&gt; &lt;li&gt; ви користуєтеся телефоном у темряві, наприклад уночі чи перед сном.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3592,9 +3601,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Сигнали дзвінка"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Інші звуки та вібросигнали"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Сповіщення"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Розмова"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Нещодавні сповіщення"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Переглянути всі за останні 7 днів"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Розширені налаштування"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Загальні"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Робочі сповіщення"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивні сповіщення"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Пріоритет адаптивних сповіщень"</string>
@@ -3656,7 +3666,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показувати на розкривній панелі, у рядку стану й на заблокованому екрані"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сховати беззвучні сповіщення в рядку стану"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Блимання"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"На заблокованому екрані"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Конфіденційність"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускати заблокований екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Після розпізнавання обличчя переходити на останній відкритий екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокований екран, екран блокування, пропустити, обходити"</string>
@@ -3776,13 +3786,15 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Сповіщення про повідомлення"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Сповіщення зі звуком чи вібрацією"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучні сповіщення"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Додатки, не підключені до цього прослуховувача"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Усі додатки підключено"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">%d додаток не підключено</item>
+      <item quantity="few">%d додатки не підключено</item>
+      <item quantity="many">%d додатків не підключено</item>
+      <item quantity="other">%d додатка не підключено</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Підключені додатки"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Допоміжні VR-сервіси"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установлені додатки не запитували доступу для роботи в режимі допоміжних служб VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Надати VR-сервісу доступ до сервісу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4482,7 +4494,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> обмеження</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор може по-іншому вимірювати статистику використання трафіку"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не включає дані, що використовуються в мережах операторів мобільного зв\'язку"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Не включає дані, що використовуються в мережах операторів мобільного зв\'язку"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Сповіщення щодо трафіку"</string>
     <string name="data_warning" msgid="2925054658166062884">"Застереження про трафік"</string>
@@ -5054,7 +5066,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Змінити режим роботи мережі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Рекомендований тип мережі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версія налаштувань"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Виклики"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Відеовиклики в мережі оператора"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Вибір системи"</string>
@@ -5103,6 +5116,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Вийміть SIM-карту та вставте її знову. Якщо проблема не зникне, перезапустіть пристрій."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Спробуйте знову ввімкнути SIM-карту. Якщо проблема не зникне, перезапустіть пристрій."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активація мережі"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Змінення оператора"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> активовано"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Натисніть, щоб оновити налаштування SIM-карти"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ви перейшли в мережу оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5282,7 +5296,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Тимчасово недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Немає SIM-карти"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметри"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Налаштування мережі"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Підключатися до загальнодоступних мереж"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"з\'єднання з мережею, Інтернет, бездротове, дані, Wi-Fi, wi-fi, wi fi, мобільний, стільниковий, оператор мобільного зв\'язку, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Мережі, доступні в режимі польоту"</string>
@@ -5296,7 +5310,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Вирішити проблеми зі з\'єднанням"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Мережі, доступні в режимі польоту"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Щоб вибрати іншу мережу, від\'єднайте кабель Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Якщо встановлено з\'єднання, змінити мережу не можна"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мережі в режимі польоту"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Підключено"</string>
@@ -5331,4 +5344,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ввести номер телефону"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефону відсутній."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволити 2G"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4bda711..a32a5cf 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"اسکرین پر موجود متن کو چھوٹا یا بڑا کریں۔"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"چھوٹا کریں"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"بڑا کریں"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"خود کار طور پر گھمائیں کا استعمال کریں"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"‏چہرے پر مبنی خود کار طور پر گھمانے کی سہولت یہ دیکھنے کے لیے فرنٹ کیمرے کا استعمال کرتی ہے کہ اسکرین پر کون کیسے دیکھ رہا ہے۔ یہ لیٹنے کے دوران پڑھنے کی اجازت دیتی ہے اور تصاویر کبھی بھی Google میں نہ تو اسٹور کی جاتی ہیں اور نہ ہی بھیجی جاتی ہیں br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&amp;gt مزید جانیں&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نمونہ متن"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"اوز کا شاندار جادوگر"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"گیارھواں باب: اوز کا شاندار زمردی شہر"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"تلاش کریں"</string>
     <string name="display_settings" msgid="7197750639709493852">"ڈسپلے"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"اسکرین کو خود کار طور پر گھمائیں"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"آف"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"آن"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"آن - چہرے پر مبنی"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"چہرے کی شناخت کو فعال کریں"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"قدرتی"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"بڑھایا گیا"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"دوسرے صارفین"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"آلہ کا اسٹوریج"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"پورٹیبل اسٹوریج"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> میں سے <xliff:g id="USED">%1$s</xliff:g> استعمال ہو گئی"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> میں سے استعمال ہو گئی"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"حال میں کسی ایپ نے مقام تک رسائی حاصل نہیں کی ہے"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"بیٹری کا زیادہ استعمال"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"بیٹری کا کم استعمال"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏Wi-Fi اور بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏Wi‑Fi اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏Wi‑Fi کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت Wi‑Fi نیٹ ورکس اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"دفتر کے لیے مقام کی سروسز"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"مقام کے ٹائم زون کی شناخت"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"مقام کے ٹائم زون کی شناخت"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ ایکسیسبیلٹی خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"فونٹ سائز تبدیل کریں"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"اسکرین ریڈرز"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"کیپشنز"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"آڈیو"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"ڈسپلے"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"متن اور ڈسپلے"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"اسکرین کو مزید گہرا کریں"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"سرخ-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"سرخ-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"نیلا-پیلا"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"چمک کم کریں"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"اپنے فون کی کم سے کم چمک کے مقابلے میں اپنی اسکرین کو مزید گہرا کریں"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"اپنے ٹیبلیٹ کی کم سے کم چمک کے مقابلے میں اپنی اسکرین کو مزید گہرا کریں"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏اپنی اسکرین کو زیادہ گہرا کریں تاکہ اس کو پڑھنے میں مزید سہولت ہو۔;lt;br/&gt;&lt;br/&amp;gt&amp; یہ مددگار ثابت ہو سکتی ہے اس صورت میں جب: ;lt;ol&gt; &lt;li&amp;gt&amp; آپ کے فون کی ڈیفالٹ کم سے کم چمک ابھی بھی بہت روشن ہو;lt;/li&gt; &lt;li&amp;gt&amp; آپ اپنا فون تاریک ماحول میں استعمال کر رہے ہیں جیسے رات میں یا سونے سے پہلے کسی تاریک کمرے میں;lt;/li&gt; &lt;/ol&amp;gt&amp;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"رنگ ٹونز"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"دیگر آوازیں اور وائبریشنز"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"اطلاعات"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"گفتگو"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"حال ہی میں اطلاعات بھیجنے والی ایپس"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"گزشتہ 7 دنوں کی تمام ملاحظہ کریں"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"جدید ترین"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"عام"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"دفتری اطلاعات"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"تغیر پذیر اطلاعات"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"تغیر پذیر اطلاع کی ترجیح"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"نیچے کی طرف کھینچیں شیڈ، اسٹیٹس بار اور مقفل اسکرین پر ڈسپلے کرتا ہے"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"اسٹیٹس بار میں خاموش اطلاعات کو چھپائیں"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"بلنک لائٹ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"لاک اسکرین پر اطلاعات"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"رازداری"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"مقفل اسکرین کو نظرانداز کرنے کیلئے"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"چہرے کے ذریعے غیر مقفل کرنے کے بعد، آخری استعمال کردہ اسکرین پر جائیں"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"مقفل اسکرین، لاک اسکرین، نظر انداز کریں، بائی پاس کریں"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"بات چیت کی اطلاعات"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"متنبہ کرنے کی اطلاعات"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"خاموش اطلاعات"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"ایپس جو اس سامع کیلئے برجڈ نہیں ہیں"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"تمام ایپس برجڈ ہیں"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">‏%d ایپس برجڈ نہیں ہیں</item>
+      <item quantity="one">‏%d ایپ برجڈ نہیں ہے</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"برجڈ ایپس"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏VR مددگار سروسز"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏کسی انسٹال کردہ ایپ نے VR مددگار سروسز کے طور پر چلائے جانے کی درخواست نہیں کی ہے۔"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏<xliff:g id="SERVICE">%1$s</xliff:g> کیلئے VR سروس کی رسائی کی اجازت دیں؟"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 پابندی</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"کیریئر ڈیٹا کا حساب آپ کے آلہ کے حساب سے مختلف ہو سکتا ہے"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"کیریئر نیٹ ورکس کے ذریعے استعمال کردہ ڈیٹا کو خارج کرتا ہے"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"کیریئر نیٹ ورکس کے ذریعے استعمال کردہ ڈیٹا کو خارج کرتا ہے"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ڈیٹا وارننگ سیٹ کریں"</string>
     <string name="data_warning" msgid="2925054658166062884">"ڈیٹا وارننگ"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"نیٹ ورک آپریٹ کرنے کی وضع تبدیل کریں"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ترجیحی نیٹ ورک کی قسم"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"کیریئر"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ترتیبات کا ورژن"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"کالنگ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"کیرئیر ویڈیو کالنگ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"سسٹم کا انتخاب"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏SIM کو دوبارہ آن کرنے کی کوشش کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"نیٹ ورک کی فعالیت"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"کیریئر سوئچنگ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال ہے"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏SIM کی ترتیبات کو اپ ڈیٹ کرنے کے ليے تھپتھپائیں"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ ہو گیا"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"دستیاب نہیں"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"عارضی طور پر دستیاب نہیں ہے"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏کوئی SIM نہیں ہے"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ترجیحات"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"نیٹ ورک کی ترجیحات"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"عوامی نیٹ ورکس سے منسلک ہوں"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏نیٹ ورک کنکشن، انٹرنیٹ، وائرلیس، ڈیٹا، wifi، wi-fi، wi fi، سیلولر، موبائل، سیل کیریئر، 4g، 3g، 2g، ‏lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ہوائی جہاز وضع کے نیٹ ورکس دیکھیں"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"کنیکٹوٹی درست کریں"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"ہوائی جہاز وضع کے نیٹ ورکس دستیاب ہیں"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"نیٹ ورکس پر سوئچ کرنے کیلئے، ایتھرنیٹ غیر منسلک کریں"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"منسلک ہونے کے دوران نیٹ ورکس کو سوئچ نہیں کر سکتے"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ہوائی جہاز وضع کے نیٹ ورکس"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"منسلک ہے"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"فون نمبر درج کریں"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"فون نمبر موجود نہیں ہے۔"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ٹھیک ہے"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏2G کو اجازت دیں"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 04623dd..0b86c1a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ekrandagi matnni kattalashtirish yoki kichiklashtirish."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kichiklashtirish"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Kattalashtirish"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Avtomatik burishdan foydalanish"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Yuz asosida avtomatik burish rejimi kimdir old kameraga qaraganini aniqlashda ishlatiladi Bu yotib oʻqish imkonini beradi va rasmlar hech qachon saqlanmaydi va Googlega yuborilmaydi.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Batafsil&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Namunaviy matn"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz mamlakati sehrgari"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11-bob: Oz mamlakatining zumrad shahri"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Qidiruv"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Ekranning avtomatik burilishi"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Oʻchirish"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Yoqish"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Yoqish - Yuz asosida"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Yuzni tanishni yoqish"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Ranglar"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tabiiy"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Yorqin"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Boshqa foydalanuvchilar"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Qurilma xotirasi"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Tashqi xotira"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ishlatilgan, jami: <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Jami: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Hech qanday ilova yaqinda joylashuv axborotidan foydalanmagan"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Yuqori batareya sarfi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Batareya sarfi kam"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi va Bluetooth qidirish"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi tarmoqlarni qidirish"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi yoniq emasligida ham ilovalar va xizmatlarga Wi-Fi tarmoqlarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth qurilmalarni qidirish"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth yoniq emasligida ham ilovalar va xizmatlarga yaqin-atrofdagi qurilmalarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ish uchun joylashuv xizmatlari"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Qurilmangizdan qulay foydalanish uchun maxsus imkoniyatlardan foydalaning. Bu parametrlarni keyinroq sozlamalar orqali o‘zgartirish mumkin."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Shrift o‘lchamini o‘zgartiring"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrandan o‘qish vositalari"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio va ekrandagi matn"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Taglavhalar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Matn va displey"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranni xiralashtirish"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qizil va yashil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qizil va yashil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Koʻk va sariq"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Yorqinlikni pasaytirish"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Telefon ekranidagi minimal yorqinlikni yanada xiralashtirish"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Planshet ekranidagi minimal yorqinlikni yanada xiralashtirish"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Qulayroq oʻqish uchun ekranni xiralashtiring.&lt;br&gt;&lt;br&gt;Qachon foydali:&lt;ol&gt;&lt;li&gt;Telefondagi standart minimal yorqinlik juda baland&lt;/li&gt;&lt;li&gt;Telefon tunda va uxlashdan oldin kabi qorongʻi muhitda ishlatilganda&lt;/li&gt;&lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtonlar"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Boshqa tovush va tebranishlar"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirishnomalar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Suhbat"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Yaqinda yuborilgan"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Hammasi (oxirgi 7 kun)"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Kengaytirilgan sozlamalar"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umumiy"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ishga oid bildirishnomalar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Moslashuvchan bildirishnomalar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Moslashuvchan bildirishnomalar muhimligi"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bildirishnomalar paneli, holat qatori va ekran qulfida chiqarish"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Holat qatorida ovozsiz bildirishnomalarni tozalash"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Indikator"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ekran qulfida bildirishnomalar"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Maxfiylik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ekran qulfini tashlab ketish"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Yuz bilan ochilgandan keyin oxirgi ishlatilgan ekran ochilsin"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran qulfi, qulflash, tashlab ketish, aylanib oʻtish"</string>
@@ -3657,7 +3667,7 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> ta bildirishnoma (haftasiga)</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Hech qachon"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Bildirishnomalarga kirish"</string>
+    <string name="manage_notification_access_title" msgid="4714320299084782521">"Bildirishnomalarga ruxsat"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Ish profili bildirishnomalariga kirish taqiqlangan"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Ilovalar bildirishnomalarni ko‘ra olmaydi"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3686,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Faolsizlantirish"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Bekor qilish"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Ruxsat etilgan bildirishnoma turlari"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Muhim davomiy bildirishnomalar"</string>
+    <string name="notif_type_ongoing" msgid="2295338067608686711">"Joriy muhim bildirishnomalar"</string>
     <string name="notif_type_conversation" msgid="3014259738224129504">"Suhbat bildirishnomalari"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Ogohlantirishlar"</string>
+    <string name="notif_type_alerting" msgid="2300039323822104165">"Ogohlantiruvchi bildirishnomalar"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Sokin bildirishnomalar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Bu xizmatga ulanmagan ilovalar"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Barcha ilovalar ulangan"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d ta ilova ulanmagan</item>
+      <item quantity="one">%d ta ilova ulanmagan</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Ulangan ilovalar"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Yordamchi VR xizmatlar"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hech qanday ilova yordamchi VR xizmatlar sifatida ishga tushirilishiga ruxsat so‘ramagan."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xizmatiga “<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatidan foydalanishga ruxsat berilsinmi?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 ta cheklov</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mobil tarmoq trafik sarfidan boshqa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Mobil tarmoq trafigi faolsizlantirildi"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Trafik sarfiga oid ogohlantirish"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ogohlantirish"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Tarmoq rejimini almashtiring"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tarmoq turi"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Aloqa operatori"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Sozlamalar versiyasi"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Chaqiruvlar"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator orqali videomuloqot"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Tizimni tanlang"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM kartani chiqarib olib, qaytadan soling. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM kartani qaytadan yoqing. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tarmoqni faollashtirish"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Aloqa operatorlarini oʻzaro almashtirish"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faol"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM karta sozlamalarini yangilash uchun bosing"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Bunga almashdi: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"mavjud emas"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Vaqtinchalik mavjud emas"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kartasiz"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Sozlamalar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tarmoq parametrlari"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ochiq tarmoqlarga ulanish"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tarmoq aloqasi, internet, simsiz, aloqa, wifi, wi-fi, wi fi, mobil, mobile, mobil tarmoq operatori, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Parvoz rejimi tarmoqlarini ochish"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Aloqani tiklash"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Parvoz rejimi tarmoqlari mavjud"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Boshqa tarmoqqa almashish uchun Ethernet tarmogʻini uzing"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ulangan tarmoqlarni almashtirish imkonsiz"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Parvoz rejimi tarmoqlari"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ulandi"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon raqamini kiriting"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon raqami kiritilmagan."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G tarmoqqa ruxsat bering"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a6f5420..1246bb7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Thu nhỏ hoặc phóng to văn bản trên màn hình."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Thu nhỏ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Phóng to"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Dùng tính năng Tự động xoay"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Tính năng Tự động xoay dựa trên khuôn mặt dùng máy ảnh trước để xem liệu có người nào đang nhìn vào màn hình hay không và theo cách nào. Tính năng này giúp bạn có thể đọc khi đang nằm và hình ảnh không bao giờ được lưu trữ hoặc gửi đến Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Tìm hiểu thêm&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Văn bản mẫu"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Phù thủy xứ Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chương 11: Thành phố ngọc lục bảo của xứ Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Tìm kiếm"</string>
     <string name="display_settings" msgid="7197750639709493852">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Tự động xoay màn hình"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Đang tắt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Đang bật"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Đang bật – Dựa trên khuôn mặt"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Bật tính năng Phát hiện khuôn mặt"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Màu"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tự nhiên"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Tăng độ nét"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Người dùng khác"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Bộ nhớ của thiết bị"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bộ nhớ di động"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"Đã sử dụng <xliff:g id="USED">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Đã dùng trong tổng số <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Gần đây, không có ứng dụng nào truy cập vào vị trí"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mức sử dụng pin cao"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mức sử dụng pin thấp"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Quét tìm Wi‑Fi và Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Quét tìm Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Cho phép các ứng dụng và dịch vụ quét tìm mạng Wi‑Fi bất kỳ lúc nào, ngay cả khi Wi-Fi tắt. Bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Quét tìm Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Cho phép các ứng dụng và dịch vụ quét tìm thiết bị lân cận bất kỳ lúc nào, ngay cả khi Bluetooth đang tắt. Chẳng hạn như bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Dịch vụ vị trí cho công việc"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Phát hiện múi giờ theo vị trí"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Phát hiện múi giờ theo vị trí"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng hỗ trợ tiếp cận này trong phần Cài đặt."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Thay đổi cỡ chữ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Trình đọc màn hình"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Âm thanh và văn bản trên màn hình"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Phụ đề"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Âm thanh"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Hiển thị"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Văn bản và hiển thị"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Giảm bớt độ sáng màn hình"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Xanh lam – vàng"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Giảm độ sáng"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Giảm bớt độ sáng của màn hình xuống dưới mức sáng tối thiểu của điện thoại"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Giảm bớt độ sáng của màn hình xuống dưới mức sáng tối thiểu của máy tính bảng"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Giảm bớt độ sáng màn hình để đọc thoải mái hơn.&lt;br/&gt;&lt;br/&gt; Chế độ cài đặt này có thể hữu ích khi: &lt;ol&gt; &lt;li&gt; Độ sáng tối thiểu mặc định của điện thoại vẫn ở mức quá cao&lt;/li&gt; &lt;li&gt; Bạn đang dùng điện thoại trong điều kiện thiếu ánh sáng, chẳng hạn như khi trời tối hoặc trong phòng tối trước khi đi ngủ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nhạc chuông"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Âm thanh khác và rung"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Thông báo"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Cuộc trò chuyện"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Đã gửi gần đây"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Xem tất cả ứng dụng trong 7 ngày qua"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Nâng cao"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Chung"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Thông báo công việc"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Thông báo thích ứng"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Mức độ ưu tiên của thông báo thích ứng"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Hiển thị trong ngăn kéo xuống, thanh trạng thái và trên màn hình khóa"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ẩn các thông báo im lặng trong thanh trạng thái"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Nhấp nháy đèn"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Thông báo trên màn hình khóa"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Quyền riêng tư"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Bỏ qua màn hình khóa"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Sau khi mở khóa bằng khuôn mặt, chuyển thẳng tới màn hình dùng gần đây nhất"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khóa màn hình, Màn hình khóa, Bỏ qua"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Thông báo về cuộc trò chuyện"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Thông báo cảnh báo"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Thông báo im lặng"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Những ứng dụng không bật chế độ cầu nối với trình nghe này"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Tất cả ứng dụng đều ở chế độ cầu nối"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d ứng dụng không ở chế độ cầu nối</item>
+      <item quantity="one">%d ứng dụng ở chế độ cầu nối</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Những ứng dụng ở chế độ cầu nối"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Các dịch vụ của trình trợ giúp thực tế ảo"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Không có ứng dụng đã cài đặt nào yêu cầu được chạy dưới dạng dịch vụ trình trợ giúp VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Cho phép quyền truy cập dịch vụ VR đối với <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 hạn chế</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cách tính dữ liệu của nhà mạng có thể khác với thiết bị của bạn."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngoại trừ dữ liệu được dùng trong mạng của nhà mạng"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Loại trừ dữ liệu được dùng trong mạng của nhà mạng"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Đặt cảnh báo dữ liệu"</string>
     <string name="data_warning" msgid="2925054658166062884">"Cảnh báo dữ liệu"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Thay đổi chế độ hoạt động của mạng"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Loại mạng ưa thích"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Nhà mạng"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Phiên bản cài đặt"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Gọi điện"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Tính năng gọi video của nhà mạng"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Chọn hệ thống"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hãy tháo SIM rồi lắp lại. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Hãy thử bật lại SIM. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kích hoạt mạng"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Chuyển nhà mạng"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> đang hoạt động"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Nhấn để cập nhật tùy chọn cài đặt SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Đã chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"không có sẵn"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tạm thời không sử dụng được"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Không có SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Lựa chọn ưu tiên"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Lựa chọn ưu tiên về mạng"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kết nối với mạng công cộng"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"kết nối mạng, Internet, không dây, dữ liệu, wifi, wi-fi, wi fi, di động, nhà mạng di động, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Xem các mạng khi ở chế độ trên máy bay"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Khắc phục sự cố về kết nối"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Các mạng dùng được khi ở chế độ trên máy bay"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Để chuyển mạng, hãy rút cáp Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bạn không thể chuyển đổi mạng khi đã kết nối"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mạng ở chế độ trên máy bay"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Đã kết nối"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Nhập số điện thoại"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Thiếu số điện thoại."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Đã hiểu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Cho phép 2G"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a4ec4f0..b9594e5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"缩小或放大屏幕上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"缩小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"使用自动屏幕旋转"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"基于人脸的自动屏幕旋转功能会使用前置摄像头，判断是否有人正在看屏幕及其看屏幕的方式。该功能可让您在躺着时阅读内容。系统绝不会存储图片或将图片发送给 Google。&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;了解详情&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"示例文本"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"绿野仙踪"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"第 11 章：奥兹国神奇的翡翠城"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜索"</string>
     <string name="display_settings" msgid="7197750639709493852">"显示"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自动旋转屏幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"关闭"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"开启"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"开启 - 基于人脸"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"启用人脸检测"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"颜色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然色"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"增强色"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他用户"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"内部存储设备"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"便携式存储设备"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g>（共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"（共 <xliff:g id="TOTAL">%1$s</xliff:g>）"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"最近没有任何应用访问位置信息"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"高电耗"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"低电耗"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WLAN 和蓝牙扫描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WLAN 扫描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允许应用和服务随时扫描 WLAN 网络（即使 WLAN 已关闭）。这可用于改进基于位置的功能和服务。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"蓝牙扫描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允许应用和服务随时扫描附近的设备（即使蓝牙已关闭）。这可用于改进基于位置的功能和服务。"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用位置信息服务"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置信息时区检测"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置信息时区检测"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些辅助功能设置。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"更改字体大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"屏幕阅读器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音频和屏幕上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音频"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"显示"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字和显示"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"调暗屏幕"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"红绿不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"红绿不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"蓝黄不分"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"调低亮度"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"将屏幕调得比手机最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"将屏幕调得比平板电脑最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"调暗屏幕可让您看手机时更舒适。&lt;br/&gt;&lt;br/&gt; 此设置适用于以下情况：&lt;ol&gt; &lt;li&gt; 手机的默认最低亮度依然太亮&lt;/li&gt; &lt;li&gt; 在夜间或睡前昏暗的房间等较暗环境中使用手机&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"铃声"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他提示音和振动"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"对话"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近发送"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看过去 7 天的所有应用"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"高级"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"常规"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"工作通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自动调节通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自适应通知优先级"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"显示在下拉通知栏、状态栏以及锁定屏幕中"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隐藏状态栏中的无声通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"闪烁指示灯"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"锁定屏幕上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隐私设置"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"跳过锁定屏幕"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"进行人脸解锁后，直接转到上次离开时的画面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"锁定屏幕, 锁屏, 跳过, 绕过"</string>
@@ -3667,10 +3677,10 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"自动调节通知"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"无"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"没有任何已安装的应用请求通知访问权限。"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"授予通知访问权限"</string>
-    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要允许<xliff:g id="SERVICE">%1$s</xliff:g>访问通知吗？"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"授予通知使用权"</string>
+    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗？"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>将可读取所有通知（包括联系人姓名和您收到的消息内容等个人信息），而且还能关闭通知或触发通知中的按钮（包括接听来电）。\n\n此外，该应用将因此能够开启或关闭“勿扰”模式并更改相关设置。"</string>
-    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要允许<xliff:g id="SERVICE">%1$s</xliff:g>获取通知访问权限吗？"</string>
+    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗？"</string>
     <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>将可读取所有通知（包括联系人姓名和您收到的消息内容等个人信息），而且还能关闭通知或触发通知中的按钮（包括接听来电）。\n\n此外，该应用将因此能够开启或关闭“勿扰”模式并更改相关设置。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"如果您停用<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>的通知访问权限，勿扰模式的访问权限可能也会遭到停用。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"停用"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"对话通知"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"提醒通知"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"无声通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"未与此监听器桥接的应用"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"所有应用均已桥接"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d 个应用未桥接</item>
+      <item quantity="one">%d 个应用未桥接</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"已桥接的应用"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服务"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"没有任何已安装的应用请求以 VR 助手服务的形式运行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允许<xliff:g id="SERVICE">%1$s</xliff:g>访问 VR 服务吗？"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 项限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括运营商网络的流量消耗"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"不包括运营商网络的流量消耗"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"设置数据流量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"数据流量警告"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"更改网络运行方式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"首选网络类型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"运营商"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"设置版本"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"通话"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"运营商视频通话"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"系统选择"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"请取出 SIM 卡，然后重新插入。如果问题仍然存在，请重启您的设备。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"请尝试重新启用 SIM 卡。如果问题仍然存在，请重启您的设备。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"网络激活"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"正在切换运营商"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>已启用"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"点按即可更新 SIM 卡设置"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"不可用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暂时无法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"没有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好设置"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"网络偏好设置"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"连接到公共网络"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"网络连接, 互联网, 无线, 数据, WiFi, Wi-Fi, Wi Fi, WLAN, 移动网络, 移动, 手机运营商, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飞行模式网络"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"修复连接"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飞行模式网络"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切换网络，请拔出以太网网线"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"连接到以太网时无法切换网络"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飞行模式网络"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已连接"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"输入电话号码"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少电话号码。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"确定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允许启用 2G"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 224be1f..b416022 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"縮小或放大畫面上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"縮小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"啟用自動旋轉"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"面孔偵測自動旋轉功能會使用前置鏡頭，判斷是否有人正在看著螢幕，以及注視螢幕的方式。此功能可讓您在躺下時閱讀內容。系統不會儲存相關圖片或將其傳送給 Google。&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;瞭解詳情&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"範例文字"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"《綠野仙蹤》"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"第 11 章：奧茲國的奇妙翡翠城"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜尋"</string>
     <string name="display_settings" msgid="7197750639709493852">"螢幕"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自動旋轉螢幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"已關閉"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"已開啟"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"已開啟 - 根據臉孔偵測"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"啟用臉孔偵測"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"顏色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"強化"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他使用者"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"儲存裝置"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"外置儲存空間"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1740,11 +1744,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"近期未有應用程式存取位置資訊"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"高耗電量"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"低耗電量"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 和藍牙掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi 掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允許應用程式和服務隨時掃瞄 Wi-Fi 網絡 (即使 Wi-Fi 已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃瞄"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
@@ -2145,7 +2150,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"您可視乎個人需要自訂此裝置。這些無障礙功能可在 [設定] 中變更。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和螢幕上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音訊"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字廣告同多媒體廣告"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"校暗螢幕"</string>
@@ -2298,7 +2306,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅綠不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅綠不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍黃不分"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"調低亮度"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"將螢幕亮度調整至低於手機的最低亮度"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"將螢幕亮度調整至低於平板電腦的最低亮度"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"將螢幕調暗可讓您看手機時更舒適。&lt;br/&gt;&lt;br/&gt; 此設定適用於以下情況：&lt;ol&gt; &lt;li&gt; 手機預設的最低亮度仍然太亮&lt;/li&gt; &lt;li&gt; 在夜間或睡前黑暗的房間等昏暗環境下使用手機&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3505,9 +3514,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他音效和震動"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"對話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近傳送通知的應用程式"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看過去 7 天的所有應用程式"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"進階"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"一般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"工作通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自動調節通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自動調節通知優先次序"</string>
@@ -3569,7 +3579,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"在下拉式面板、狀態列和上鎖畫面中顯示"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隱藏狀態列的靜音通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃燈"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"上鎖畫面上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"私隱"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過上鎖畫面"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"完成面孔解鎖後，直接前往上次使用的畫面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"上鎖畫面, 鎖定螢幕, 略過, 繞過"</string>
@@ -3681,13 +3691,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"對話通知"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"提醒通知"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"靜音通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"未與此接聽器橋接的應用程式"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"所有應用程式均已橋接"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">%d 個應用程式未橋接</item>
+      <item quantity="one">%d 個應用程式未橋接</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"已橋接的應用程式"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有已安裝的應用程式要求提供 VR 助手服務。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允許 VR 服務存取 <xliff:g id="SERVICE">%1$s</xliff:g> 嗎？"</string>
@@ -4349,7 +4359,7 @@
       <item quantity="one">1 個限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括流動網絡供應商網絡使用的數據"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"不包括流動網絡供應商網絡使用的數據"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4893,7 +4903,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"更改網絡操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"首選網絡類型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"流動網絡供應商"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定版本"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"流動網絡供應商視像通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"系統選擇"</string>
@@ -4942,6 +4953,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入。如果問題持續發生，請重新啟動裝置。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請嘗試再次啟用 SIM 卡。如果問題持續發生，請重新啟動裝置。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"網絡啟用"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"轉用流動網絡供應商"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"已啟用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕按以更新 SIM 卡設定"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5117,7 +5129,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網絡偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公共網絡"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網絡連線, 互聯網, 無線, 數據, Wi-Fi, 流動網絡, 流動裝置, 流動網絡供應商, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛行模式網絡"</string>
@@ -5131,7 +5143,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飛行模式網絡"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網絡，請中斷以太網連線"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連接以太網絡後就無法切絡"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛行模式網絡"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
@@ -5166,4 +5177,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入電話號碼"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允許啟用 2G"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3162f01..bb5fca3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"縮小或放大畫面上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"縮小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"啟用自動旋轉"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"臉部偵測自動旋轉功能會使用前置鏡頭，判斷是否有人正在看著螢幕，以及注視螢幕的方式。這項功能可讓你在躺下時閱讀內容。系統不會儲存相關圖片或將其傳送給 Google。&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;瞭解詳情&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"範例文字"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"綠野仙蹤"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"第 11 章：奧茲國的翡翠城"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜尋"</string>
     <string name="display_settings" msgid="7197750639709493852">"螢幕"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自動旋轉螢幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"已關閉"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"已開啟"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"已開啟 - 臉部偵測"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"啟用臉部偵測"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"色彩"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"增強"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他使用者"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"裝置儲存空間"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"可攜式儲存空間"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1739,11 +1743,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"最近沒有任何應用程式存取位置資訊"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"耗電量高"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"耗電量低"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 和藍牙掃描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"掃描 Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允許應用程式和服務隨時掃描 Wi‑Fi 網路 (即使 Wi-Fi 功能處於關閉狀態)。這麼做可以改善適地性功能和服務等等。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這麼做可以改善適地性功能和服務等等。"</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
@@ -2144,7 +2149,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"你可以根據個人需求自訂這個裝置，日後，你可以前往 [設定] 變更這些無障礙功能。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和畫面上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音訊"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字和顯示"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"調暗螢幕"</string>
@@ -2297,7 +2305,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅 - 綠"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅 - 綠"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍 - 黃"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"調低亮度"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"將螢幕調得比手機最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"將螢幕調得比平板電腦最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"將螢幕調暗可讓你看手機時更舒適。&lt;br/&gt;&lt;br/&gt; 這項設定適用於以下情況：&lt;ol&gt; &lt;li&gt; 手機預設的最低亮度依然太亮&lt;/li&gt; &lt;li&gt; 在夜間或就寢前黑暗的房間等昏暗環境下使用手機&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3504,9 +3513,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他音效與震動"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"對話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近傳送通知的應用程式"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看過去 7 天的所有相關內容"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"進階"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"一般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work 通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自動調整通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自動調整通知優先順序"</string>
@@ -3568,7 +3578,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"顯示在下拉式通知欄、狀態列和螢幕鎖定畫面中"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隱藏狀態列中的靜音通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃爍燈光"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"螢幕鎖定畫面上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隱私權"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過螢幕鎖定程序"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"使用臉孔將裝置解鎖後，直接前往上次使用的畫面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"螢幕鎖定, 鎖定螢幕, 略過, 規避"</string>
@@ -3680,13 +3690,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"對話通知"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"警示通知"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"靜音通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"未橋接到這個接聽器的應用程式"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"所有應用程式都已橋接"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="other">有 %d 個未橋接的應用程式</item>
+      <item quantity="one">有 %d 個未橋接的應用程式</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"已橋接的應用程式"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 小幫手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有任何已安裝的應用程式要求透過 VR 小幫手服務來執行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 存取 VR 服務嗎？"</string>
@@ -4348,7 +4358,7 @@
       <item quantity="one">1 項限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"電信業者與裝置的數據計算方式可能有所不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"排除電信業者網路的數據用量"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"排除電信業者網路的數據用量"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4892,7 +4902,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"變更網路操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"偏好的網路類型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"電信業者"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定版本"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"電信業者視訊通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"選取系統"</string>
@@ -4941,6 +4952,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入，如果問題持續發生，請重新啟動裝置。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請試著再次啟用 SIM 卡，如果問題持續發生，請重新啟動裝置。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"啟用網路"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"正在切換電信業者"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」已啟用"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕觸即可更新 SIM 卡設定"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切換成「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
@@ -5116,7 +5128,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網路偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公用網路"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網路連線, 網際網路, 無線, 行動數據, wifi, wi-fi, wi fi, 行動網路, 行動, 電信業者, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛航模式網路"</string>
@@ -5130,7 +5142,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"目前可以使用飛航模式網路"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網路，請中斷乙太網路連線"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連上乙太網路後就無法切換到其他網路"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛航模式網路"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
@@ -5165,4 +5176,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入手機號碼"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允許啟用 2G"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae6409e..34e2e43 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -52,10 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Yenza umbhalo okusikrini ube mncane noma mkhulu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Yenza kube kuncane"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Yenza kube kukhulu"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
-    <skip />
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Sebenzisa ukuphenduka okuzenzakalelayo"</string>
+    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Ukuphenduka okuzenzakalelayo okususelwe kubuso kusebenzizsa ikhamera engaphambili ukubona ukuthi umuntu ubhekile yini isikrini futhi kanjani. Kuvumela ukufunda ngenkathi ulele futhi izithombe azigcinwa noma azithunyelwa ku-Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&lt;Funda kabanzi&lt;/a&gt;"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Isampuli yombhalo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"I-The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Isahluko 11: The Wonderful Emerald City of Oz"</string>
@@ -1176,14 +1174,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Sesha"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ukubukeka"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Phendula iskrini ngokuzenzakalela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Valiwe"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Vuliwe"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Vuliwe - Kususelwe kubuso"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Nika amandla ukutholwa kobuso"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Imibala"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Kwemvelo"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"I-Boost"</string>
@@ -1478,6 +1472,16 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Abanye abasebenzisi"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Isitoreji sedivayisi"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Isitoreji esincane"</string>
+    <!-- no translation found for alarms_and_reminders_label (8103111654170690088) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_switch_title (4462627719161866171) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_title (5296823629394843360) -->
+    <skip />
+    <!-- no translation found for alarms_and_reminders_footer_title (5527294963734043995) -->
+    <skip />
+    <!-- no translation found for keywords_alarms_and_reminders (3886835524865727135) -->
+    <skip />
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> okusetshenzisiwe kokungu-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Okusetshenzisiwe kokungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1740,11 +1744,12 @@
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ayikho indawo yezinhlelo zokusebenza ezifinyelelwe kamuva nje"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Ukusebenzisa ibhethri okuphezulu"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Ukusebenzisa ibhethri okuphansi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"I-Wi-Fi nokuskena kwe-Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Ukuskena kwe-Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amanethiwekhi e-Wi-Fi noma kunini, nanoma i-Wi-Fi ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ukuskena kwe-Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amadivayisi aseduze noma kunini, nanoma i-Bluetooth ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
+    <!-- no translation found for location_services_screen_title (9204334551361202877) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Amasevisi endawo omsebenzi"</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ukutholwa kwendawo yezoni yesikhathi"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ukutholwa kwendawo yezoni yesikhathi"</string>
@@ -2145,7 +2150,10 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ungenza ngendlela oyifisayo le divayisi ukuze ihlangabezane nezidingo zakho. Lezi zici ezingafinyeleleka zingashintshwa ngemuva kwesikhathi kuzilungiselelo."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Shintsha usayizi wefonti"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Izifundi zesikrini"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Umsindo nombhalo okusikrini"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Amagama-ncazo"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Umsindo"</string>
+    <!-- no translation found for general_category_title (6298579528716834157) -->
+    <skip />
     <string name="display_category_title" msgid="6638191682294461408">"Bonisa"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Umbhalo nesibonisi"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Yenza isikrini sibe mnyama"</string>
@@ -2298,7 +2306,8 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Okuluhlaza okwesibhakabhaka-okuphuzi"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Nciphisa ukukhanya"</string>
+    <!-- no translation found for reduce_bright_colors_preference_title (8004574775504450263) -->
+    <skip />
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Yenza isikrini sibe mnyama kakhulu kunokukhanya okuphansi kwefoni yakho"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Yenza isikrini sibe mnyama kakhulu kunokukhanya okuphansi kwethebulethi yakho"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Qiniseka ukuthi isikrini simnyama ukuze kube lula ukufunda.&lt;br/&gt;&lt;br/&gt; Lokhu kungaba usizo lapho: &lt;ol&gt; &lt;li&gt; Ukukhanya okuphansi okuzenzakalelayo kwefoni yakho kusakhanya kakhulu&lt;/li&gt; &lt;li&gt; Usebenzisa ifoni yakho lapho kumnyama khona njengasebusuku noma egumbini elimnyama ngaphambi kokuyolala&lt;/li&gt; &lt;ol&gt;"</string>
@@ -3505,9 +3514,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Amaringithoni"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Eminye imisindo nokudlidliza"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Izaziso"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Ingxoxo"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Kuthunyelwe kamuva nje"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Bona kone kusuka ezinsukwini ezingu-7 zokugcina"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Okuthuthukisiwe"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Okuvamile"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Izaziso zomsebenzi"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Izaziso eziguqukayo"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Ukubaluleka kwesaziso sokujwayela"</string>
@@ -3569,7 +3579,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Iboniswa kumthunzi wokudonselwa phansi, ibha yesimo nokukhiywa kwesikrini"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fihla izaziso ezithulile kubha yesimo"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cwabizisa ukukhanya"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Izaziso esikrinini sokukhiya"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Ubumfihlo"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Yeqa ukuze ukhiye isikrini"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Ngemuva kwe-face unlock, hamba ngokuqondile kusikrini sokugcina esisetshenzisiwe"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khiya isikrini, ukukhiya isikrini, yeqa, dlula"</string>
@@ -3681,13 +3691,13 @@
     <string name="notif_type_conversation" msgid="3014259738224129504">"Izaziso zengxoxo"</string>
     <string name="notif_type_alerting" msgid="2300039323822104165">"Izaziso zokuxwayisa"</string>
     <string name="notif_type_silent" msgid="2514763073653979199">"Thulisa izaziso"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Izinhlelo zokusebenza ezingabhrijiwe kulo mlaleli"</string>
+    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"Zonke izinhlelo zokusebenza zibhrijiwe"</string>
+    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
+      <item quantity="one">Izinhlelo zokusebenza ezingu-%d azibhrijiwe</item>
+      <item quantity="other">Izinhlelo zokusebenza ezingu-%d azibhrijiwe</item>
+    </plurals>
+    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Izinhlelo zokusebenza ezibhrijiwe"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Amasevisi omsizi we-VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukusetshenziswa njengamasevisi wesisizi se-VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vumela isevisi ye-VR ukufinyelela i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4349,7 +4359,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> imikhawulo</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ukubalwa kwedatha yenkampani yenethiwekhi kungahluka kusuka ekubaleni kwedivayisi"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngaphandle kwedatha esetshenziswa amanethiwekhi wenkampani yenethiwekhi"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ayifaki phakathi idatha esetshenziswe izinkampani zenethiwekhi"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenzisiwe"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setha isexwayiso sedatha"</string>
     <string name="data_warning" msgid="2925054658166062884">"Isexwayiso sedatha"</string>
@@ -4893,7 +4903,8 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Shintsha imodi esebenzayo yenethiwekhi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Uhlobo lwenethiwekhi oluncamelayo"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Inkampani yenethiwekhi"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Inguqulo yezilungiselelo"</string>
+    <!-- no translation found for carrier_settings_version (3364919669057317776) -->
+    <skip />
     <string name="call_category" msgid="641461844504128789">"Iyashaya"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Ukushaya kwevidiyo kwenkampani yenethiwekhi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Ukukhetha isistimu"</string>
@@ -4942,6 +4953,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Khipha i-SIM yakho bese uyifake futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zama ukuvula i-SIM futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ukwenziwa kusebenze kwenethiwekhi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Ukushintsha inkampani yenethiwekhi"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"I-<xliff:g id="CARRIER_NAME">%1$s</xliff:g> iyasebenza"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Thepha ukuze ubuyekeze izilungiselelo ze-SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ishintshelwe ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5117,7 +5129,7 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ayitholakali"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Akutholakali okwesikhashana"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ayikho i-SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Okuncamelayo"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Okuncamelayo kwenethiwekhi"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Xhuma kumanethiwekhi asesidlangalaleni"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"uxhumano lenethiwekhi, i-inthanethi, okungenantambo, idatha, i-wifi, i-wi-fi, i-wi fi, iselula, iselula, inkampani yekholi, i-4g, i-3g, i-2g, i-lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Buka amanethiwekhi wemodi yendiza"</string>
@@ -5131,7 +5143,6 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Lungisa ukuxhumeka"</string>
     <string name="airplane_mode_network_available" msgid="1059499681300395240">"Amanethiwekhi wemodi yendiza ayatholakala"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ukuze ushintshe amanethiwekhi, nqamula i-ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ayikwazi ukushintsha amanethiwekhi ngenkathi ixhunyiwe"</string>
     <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Amanethiwekhi wemodi yendiza"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ixhunyiwe"</string>
@@ -5166,4 +5177,5 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Faka inombolo yefoni"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Inombolo yefoni ayikho."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"KULUNGILE"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Vumela i-2G"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad7fe3c..5abba1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3359,6 +3359,22 @@
     <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
     <string name="storage_external_title">Portable storage</string>
 
+    <!-- Label for the settings activity for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
+    <string name="alarms_and_reminders_label">Alarms and reminders</string>
+    <!-- Label for the switch to toggler the permission for scheduling alarms [CHAR LIMIT=50] -->
+    <string name="alarms_and_reminders_switch_title">Allow to set alarms or reminders</string>
+    <!-- Title for the setting screen for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
+    <string name="alarms_and_reminders_title">Alarms and reminders</string>
+    <!-- Description that appears below the alarms_and_reminders switch [CHAR LIMIT=NONE] -->
+    <string name="alarms_and_reminders_footer_title">
+        Allow this app to schedule alarms or other timing based events.
+        This will allow the app to wake up and run even when you are not using the device.
+        Note that revoking this permission may cause the app to malfunction, specifically any alarms
+        that the app has scheduled will no longer work.
+    </string>
+    <!-- Keywords for setting screen for controlling apps that can schedule alarms [CHAR LIMIT=100] -->
+    <string name="keywords_alarms_and_reminders">schedule, alarm, reminder, event</string>
+
     <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
     <string name="storage_volume_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> used of <xliff:g id="total" example="32GB">%2$s</xliff:g></string>
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
@@ -4007,8 +4023,6 @@
     <string name="location_high_battery_use">High battery use</string>
     <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
     <string name="location_low_battery_use">Low battery use</string>
-    <!-- [CHAR LIMIT=60] Wireless background scanning settings screen, screen title -->
-    <string name="location_scanning_screen_title">Wi\u2011Fi and Bluetooth scanning</string>
     <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
     <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
     <!-- Preference description text for Wi-Fi always scanning -->
@@ -4017,6 +4031,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
     <!-- Description text for Bluetooth always scanning -->
     <string name="location_scanning_bluetooth_always_scanning_description">Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.</string>
+    <!-- [CHAR LIMIT=60] Location Services screen, screen title -->
+    <string name="location_services_screen_title">Location Services</string>
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
     <string name="managed_profile_location_services">Location services for work</string>
 
@@ -4965,6 +4981,8 @@
     <string name="captions_category_title">Captions</string>
     <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->
     <string name="audio_category_title">Audio</string>
+    <!-- Title for the accessibility preference category of general services and settings. [CHAR LIMIT=50] -->
+    <string name="general_category_title">General</string>
     <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
     <string name="display_category_title">Display</string>
     <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
@@ -5298,7 +5316,7 @@
     <string name="daltonizer_mode_tritanomaly_summary">Blue-yellow</string>
 
     <!-- Title for the accessibility preference and switch of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->
-    <string name="reduce_bright_colors_preference_title">Reduce Brightness</string>
+    <string name="reduce_bright_colors_preference_title">Reduce brightness</string>
     <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
     <string name="reduce_bright_colors_preference_summary" product="default">Make screen darker than your phone\u2019s minimum brightness</string>
     <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
@@ -7304,6 +7322,8 @@
     <string name="help_uri_printing" translatable="false"></string>
     <!-- Help URI, About phone [DO NOT TRANSLATE] -->
     <string name="help_uri_about" translatable="false"></string>
+    <!-- Help URI, manage apps that can set alarms and reminders [DO NOT TRANSLATE] -->
+    <string name="help_uri_alarms_and_reminders" translatable="false"></string>
 
     <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
     <string name="help_url_wifi" translatable="false"></string>
@@ -8306,6 +8326,9 @@
     <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
     <string name="configure_notification_settings">Notifications</string>
 
+    <!-- notification header - settings for conversation type notifications -->
+    <string name="conversation_notifs_category">Conversation</string>
+
     <!-- notification header - apps that have recently sent notifications -->
     <string name="recent_notifications">Recently sent</string>
 
@@ -8313,7 +8336,7 @@
     <string name="recent_notifications_see_all_title">See all from last 7 days</string>
 
     <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->
-    <string name="advanced_section_header">Advanced</string>
+    <string name="advanced_section_header">General</string>
 
     <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
     <string name="profile_section_header">Work notifications</string>
@@ -8480,8 +8503,8 @@
     <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
     <string name="notification_pulse_title">Blink light</string>
 
-    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] -->
-    <string name="lock_screen_notifications_title">Notifications on lock screen</string>
+    <!-- Configure Notifications: Title for the option controlling privacy options for notifications. [CHAR LIMIT=60] -->
+    <string name="lock_screen_notifications_title">Privacy</string>
 
     <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->
     <string name="lockscreen_bypass_title">Skip lock screen</string>
@@ -12083,7 +12106,7 @@
     <string name="carrier_settings_euicc">Carrier</string>
     <!-- Mobile network settings screen, a string showing the version of carrier settings for this
          subscription [CHAR LIMIT=NONE] -->
-    <string name="carrier_settings_version">Settings version</string>
+    <string name="carrier_settings_version">Carrier settings version</string>
 
     <!-- Mobile network settings screen, name for call settings category [CHAR LIMIT=NONE] -->
     <string name="call_category">Calling</string>
@@ -12750,6 +12773,8 @@
     <string name="adaptive_battery_main_switch_title" translatable="false">Use adaptive battery</string>
     <!-- Do not translate. Title for adaptive brightness main switch preferences. [CHAR LIMIT=50] -->
     <string name="adaptive_brightness_main_switch_title" translatable="false">Use adaptive brightness</string>
+    <!-- Do not translate. Title for wifi calling main switch preferences. [CHAR LIMIT=50] -->
+    <string name="wifi_calling_main_switch_title" translatable="false">Use Wi-Fi calling</string>
 
     <!-- Default preference title for showing all apps on device [CHAR_LIMIT=50]-->
     <string name="default_see_all_apps_title">See all apps</string>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 67b1211..1743f9b 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -128,8 +128,9 @@
 
     </PreferenceCategory>
 
-    <!-- TODO(b/174829936): Add title for shortcuts settings category. -->
-    <PreferenceCategory android:persistent="false">
+    <PreferenceCategory
+        android:persistent="false"
+        android:title="@string/general_category_title">
 
         <Preference
             android:fragment="com.android.settings.accessibility.ShortcutsSettingsFragment"
diff --git a/res/xml/alarms_and_reminders.xml b/res/xml/alarms_and_reminders.xml
new file mode 100644
index 0000000..a9d4323
--- /dev/null
+++ b/res/xml/alarms_and_reminders.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/alarms_and_reminders_title">
+
+    <com.android.settings.widget.FilterTouchesRestrictedSwitchPreference
+        android:key="alarms_and_reminders_switch"
+        android:title="@string/alarms_and_reminders_switch_title" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="alarms_and_reminders_description"
+        android:title="@string/alarms_and_reminders_footer_title"
+        android:selectable="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/configure_notification_settings_v2.xml b/res/xml/configure_notification_settings_v2.xml
index 562e193..6c3ec52 100644
--- a/res/xml/configure_notification_settings_v2.xml
+++ b/res/xml/configure_notification_settings_v2.xml
@@ -18,59 +18,27 @@
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/configure_notification_settings">
 
-    <com.android.settings.widget.VideoPreference
-        android:key="notification_model_illustration"
-        android:title="@string/summary_placeholder"
-        settings:animation="@raw/notification_interruption_model"
-        settings:controller="com.android.settings.widget.VideoPreferenceController"
-        android:persistent="false" />
-
-    <Preference
-        android:key="notification_history"
-        android:title="@string/notification_history"
-        android:summary="@string/notification_history_summary"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="false"
-        android:order="2">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
-    </Preference>
-
-    <Preference
-        android:key="conversations"
-        android:title="@string/conversations_category_title"
-        android:order="3"
-        settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
-        android:fragment="com.android.settings.notification.app.ConversationListSettings"
-    />
-
-    <Preference
-        android:key="notification_bubbles"
-        android:title="@string/notification_bubbles_title"
-        android:summary="@string/notifications_bubble_setting_on_summary"
-        android:order="4"
-        settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
-        android:fragment="com.android.settings.notification.BubbleNotificationSettings"
-    />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="app_and_notif_cell_broadcast_settings"
-        android:title="@string/cell_broadcast_settings"
-        android:order="5"
-        settings:useAdminDisabledSummary="true">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="@string/cell_broadcast_receiver_package"
-            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
-    </com.android.settingslib.RestrictedPreference>
+    <PreferenceCategory
+        android:key="conversation_category"
+        android:title="@string/conversation_notifs_category">
+        <Preference
+            android:key="conversations"
+            android:title="@string/conversations_category_title"
+            settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
+            android:fragment="com.android.settings.notification.app.ConversationListSettings"
+        />
+        <Preference
+            android:key="notification_bubbles"
+            android:title="@string/notification_bubbles_title"
+            android:summary="@string/notifications_bubble_setting_on_summary"
+            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
+            android:fragment="com.android.settings.notification.BubbleNotificationSettings"
+        />
+    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="recent_notifications_category"
-        android:title="@string/recent_notifications"
-        settings:allowDividerAbove="true"
-        android:order="6">
+        android:title="@string/recent_notifications">
         <!-- Placeholder for a list of recent apps -->
 
         <!-- See all apps button -->
@@ -78,7 +46,6 @@
             android:key="all_notifications"
             android:title="@string/notifications_title"
             android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-            android:order="7"
             settings:searchable="false">
             <extra
                 android:name="classname"
@@ -86,11 +53,18 @@
         </Preference>
     </PreferenceCategory>
 
-
     <PreferenceCategory
         android:key="configure_notifications_lock"
-        android:title="@string/lock_screen_notifications_title"
-        android:order="10">
+        android:title="@string/lock_screen_notifications_title">
+        <Preference
+            android:key="notification_history"
+            android:title="@string/notification_history"
+            android:summary="@string/notification_history_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
+        </Preference>
         <!-- When device is locked -->
         <com.android.settings.RestrictedListPreference
             android:key="lock_screen_notifications"
@@ -120,14 +94,29 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="configure_notifications_advanced"
-        android:order="15"
-        settings:initialExpandedChildrenCount="0">
+        android:key="advanced_section_header"
+        android:title="@string/advanced_section_header">
+        <com.android.settingslib.RestrictedPreference
+            android:key="zen_mode_notifications"
+            android:title="@string/zen_mode_settings_title"
+            settings:useAdminDisabledSummary="true"
+            android:fragment="com.android.settings.notification.zen.ZenModeSettings"
+            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
+        />
+        <com.android.settingslib.RestrictedPreference
+            android:key="app_and_notif_cell_broadcast_settings"
+            android:title="@string/cell_broadcast_settings"
+            settings:useAdminDisabledSummary="true">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="@string/cell_broadcast_receiver_package"
+                android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
+        </com.android.settingslib.RestrictedPreference>
 
         <SwitchPreference
-            android:key="silent_icons"
-            android:title="@string/silent_notifications_status_bar"
-            settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
+             android:key="silent_icons"
+             android:title="@string/silent_notifications_status_bar"
+             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
 
         <SwitchPreference
             android:key="show_snooze_options"
@@ -140,33 +129,10 @@
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
-        <!-- Pulse notification light -->
+        <!-- Pulse notification light, on devices that support it -->
         <SwitchPreference
             android:key="notification_pulse"
             android:title="@string/notification_pulse_title"
             settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
-
-        <!-- Default notification ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="notification_default_ringtone"
-            android:title="@string/notification_ringtone_title"
-            android:dialogTitle="@string/notification_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:ringtoneType="notification"
-            settings:searchable="false"/>
-
-        <Preference
-            android:key="gesture_swipe_down_fingerprint_notifications"
-            android:title="@string/fingerprint_swipe_for_notifications_title"
-            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
-            settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
-
-        <com.android.settingslib.RestrictedPreference
-            android:key="zen_mode_notifications"
-            android:title="@string/zen_mode_settings_title"
-            settings:useAdminDisabledSummary="true"
-            android:fragment="com.android.settings.notification.zen.ZenModeSettings"
-            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
-            settings:allowDividerAbove="false"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 8df5696..27bf0ba 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -20,7 +20,7 @@
     android:key="display_settings_screen"
     android:title="@string/display_settings"
     settings:keywords="@string/keywords_display"
-    settings:initialExpandedChildrenCount="5">
+    settings:initialExpandedChildrenCount="6">
 
     <com.android.settingslib.RestrictedPreference
         android:key="brightness"
diff --git a/res/xml/location_scanning.xml b/res/xml/location_services.xml
similarity index 77%
rename from res/xml/location_scanning.xml
rename to res/xml/location_services.xml
index f82500b..7096d2c 100644
--- a/res/xml/location_scanning.xml
+++ b/res/xml/location_services.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_scanning_screen_title">
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/location_services_screen_title">
 
         <SwitchPreference
             android:title="@string/location_scanning_wifi_always_scanning_title"
@@ -29,4 +30,9 @@
             android:defaultValue="true"
             android:key="bluetooth_always_scanning" />
 
+        <PreferenceCategory
+            android:key="location_services"
+            android:layout="@layout/preference_category_no_label"
+            settings:controller="com.android.settings.location.LocationServicePreferenceController"/>
+
 </PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fb03f4c..7a79136 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -22,16 +22,10 @@
     settings:keywords="@string/keywords_location">
 
     <PreferenceCategory
-        android:key="recent_location_requests"
-        android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
-
-    <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
-        android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
-        settings:searchable="false"/>
+        android:key="recent_location_access"
+        android:title="@string/location_category_recent_location_access"
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <PreferenceCategory
         android:key="location_advanced_settings"
@@ -50,9 +44,9 @@
         </Preference>
 
         <Preference
-            android:fragment="com.android.settings.location.ScanningSettings"
-            android:key="location_scanning"
-            android:title="@string/location_scanning_screen_title"
+            android:fragment="com.android.settings.location.LocationServices"
+            android:key="location_services"
+            android:title="@string/location_services_screen_title"
             settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
 
         <!-- This preference gets removed if there is no managed profile -->
@@ -65,11 +59,6 @@
             settings:forWork="true"
             settings:useAdminDisabledSummary="true"/>
 
-        <PreferenceCategory
-            android:key="location_services"
-            android:layout="@layout/preference_category_no_label"
-            settings:controller="com.android.settings.location.LocationServicePreferenceController"/>
-
         <!-- This preference gets removed if there is no managed profile -->
         <PreferenceCategory
             android:key="location_services_managed_profile"
diff --git a/res/xml/location_settings_personal.xml b/res/xml/location_settings_personal.xml
index de8ed81..2e1cb7e 100644
--- a/res/xml/location_settings_personal.xml
+++ b/res/xml/location_settings_personal.xml
@@ -25,14 +25,8 @@
     <PreferenceCategory
         android:key="recent_location_requests"
         android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
-
-    <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
-        android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
-        settings:searchable="false"/>
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <!-- This preference category gets removed if new_recent_location_ui is disabled -->
     <Preference
@@ -46,15 +40,10 @@
     </Preference>
 
     <Preference
-        android:key="location_scanning"
-        android:title="@string/location_scanning_screen_title"
-        android:fragment="com.android.settings.location.ScanningSettings"
-        settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
-
-    <PreferenceCategory
         android:key="location_services"
-        android:layout="@layout/preference_category_no_label"
-        settings:controller="com.android.settings.location.LocationServicePreferenceController"/>
+        android:title="@string/location_services_screen_title"
+        android:fragment="com.android.settings.location.LocationServices"
+        settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
 
     <PreferenceCategory
         android:key="location_footer"
diff --git a/res/xml/location_settings_workprofile.xml b/res/xml/location_settings_workprofile.xml
index f15c8d8..f6f2d96 100644
--- a/res/xml/location_settings_workprofile.xml
+++ b/res/xml/location_settings_workprofile.xml
@@ -25,16 +25,8 @@
     <PreferenceCategory
         android:key="recent_location_requests"
         android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
-
-    <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
-        android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
-        settings:controller="com.android.settings.core.WorkPreferenceController"
-        settings:forWork="true"
-        settings:searchable="false"/>
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="managed_profile_location_switch"
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
index 0b390b5..2281f48 100644
--- a/res/xml/network_provider_calls_sms.xml
+++ b/res/xml/network_provider_calls_sms.xml
@@ -51,12 +51,4 @@
         settings:controller="com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController"
         settings:allowDividerAbove="true"
         />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="provider_model_calls_sms_footer"
-        android:title="@string/calls_sms_footnote"
-        android:selectable="false"
-        settings:allowDividerAbove="true"
-        settings:searchable="false"
-        settings:controller="com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/notification_access_permission_details.xml b/res/xml/notification_access_permission_details.xml
index edac955..55a47f5 100644
--- a/res/xml/notification_access_permission_details.xml
+++ b/res/xml/notification_access_permission_details.xml
@@ -31,21 +31,28 @@
         android:title="@string/notification_access_detail_switch"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ApprovalPreferenceController"/>
 
-    <MultiSelectListPreference
-        android:key="notification_type_filter"
-        android:title="@string/notification_listener_type_title"
-        android:entries="@array/notif_types_titles"
-        android:entryValues="@array/notif_types_values"
-        android:summary="%s"
-        android:persistent="false"
-        style="@style/SettingsMultiSelectListPreference"
-        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.TypeFilterPreferenceController"/>/>
+    <CheckBoxPreference
+        android:key="type_filter_ongoing"
+        android:title="@string/notif_type_ongoing"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.OngoingTypeFilterPreferenceController"/>/>
+    <CheckBoxPreference
+        android:key="type_filter_conversation"
+        android:title="@string/notif_type_conversation"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ConversationTypeFilterPreferenceController"/>/>
+    <CheckBoxPreference
+        android:key="type_filter_alerting"
+        android:title="@string/notif_type_alerting"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.AlertingTypeFilterPreferenceController"/>/>
+    <CheckBoxPreference
+        android:key="type_filter_silent"
+        android:title="@string/notif_type_silent"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.SilentTypeFilterPreferenceController"/>/>
 
-        <Preference
-            android:key="bridged_apps"
-            android:title="@string/notif_listener_excluded_app_title"
-            android:fragment="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsSettings"
-            settings:searchable="false"
-            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController" />
+    <Preference
+        android:key="bridged_apps"
+        android:title="@string/notif_listener_excluded_app_title"
+        android:fragment="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsSettings"
+        settings:searchable="false"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index f683f3c..b5e414b 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -21,11 +21,10 @@
     android:title="@string/power_usage_summary_title"
     settings:keywords="@string/keywords_battery">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.UsageProgressBarPreference
         android:key="battery_header"
         android:title="@string/summary_placeholder"
         android:selectable="false"
-        android:layout="@layout/battery_header"
         settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />
 
     <Preference
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index b5dcebf..1b7b026 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -78,7 +78,6 @@
 
         <SwitchPreference
             android:key="visiblepattern_profile"
-            android:summary="@string/summary_placeholder"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
             settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
 
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 150c1e6..671d882 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -29,17 +29,6 @@
     </Preference>
 
     <Preference
-        android:key="high_power_apps"
-        android:title="@string/high_power_apps"
-        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-        settings:keywords="@string/keywords_ignore_optimizations"
-        settings:controller="com.android.settings.applications.specialaccess.HighPowerAppsController">
-        <extra
-            android:name="classname"
-            android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
-    </Preference>
-
-    <Preference
         android:key="interact_across_profiles"
         android:title="@string/interact_across_profiles_title"
         android:fragment="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings"
@@ -124,6 +113,16 @@
     </Preference>
 
     <Preference
+        android:key="alarms_and_reminders"
+        android:title="@string/alarms_and_reminders_title"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_alarms_and_reminders">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$AlarmsAndRemindersActivity" />
+    </Preference>
+
+    <Preference
         android:key="special_app_usage_access"
         android:title="@string/usage_access"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
diff --git a/res/xml/transcode_settings.xml b/res/xml/transcode_settings.xml
index b142d31..c5a9763 100644
--- a/res/xml/transcode_settings.xml
+++ b/res/xml/transcode_settings.xml
@@ -35,4 +35,9 @@
         android:key="transcode_default"
         android:title="@string/transcode_default"
         settings:controller="com.android.settings.development.transcode.TranscodeDefaultOptionPreferenceController" />
+
+    <SwitchPreference
+        android:key="transcode_notification"
+        android:title="@string/transcode_notification"
+        settings:controller="com.android.settings.development.transcode.TranscodeNotificationPreferenceController" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index 34d723f..d41c07b 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -16,8 +16,8 @@
 
 package com.android.settings;
 
-import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.ConnectivityManager.TETHERING_WIFI;
+import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
 
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 43f35a6..f79bdb2 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -28,6 +28,7 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
 import android.net.Uri;
+import android.net.VpnManager;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.AsyncTask;
@@ -101,6 +102,11 @@
                 connectivityManager.factoryReset();
             }
 
+            VpnManager vpnManager = mContext.getSystemService(VpnManager.class);
+            if (vpnManager != null) {
+                vpnManager.factoryReset();
+            }
+
             WifiManager wifiManager = (WifiManager)
                     mContext.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager != null) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1008888..f351d26 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -204,6 +204,10 @@
     public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
 
+    /** Actviity to manage apps with {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM} */
+    public static class AlarmsAndRemindersActivity extends SettingsActivity {/* empty */ }
+    /** App specific version of {@link AlarmsAndRemindersActivity} */
+    public static class AlarmsAndRemindersAppActivity extends SettingsActivity {/* empty */ }
 
     public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
     public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2c628f6..0c1ace9 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -57,6 +57,8 @@
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.widget.LayoutPreference;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import java.util.UUID;
 
 /**
@@ -112,9 +114,8 @@
 
     @VisibleForTesting
     ViewGroup mPinnedHeaderFrameLayout;
-
+    private AppBarLayout mAppBarLayout;
     private LayoutPreference mHeader;
-
     private View mEmptyView;
     private LinearLayoutManager mLayoutManager;
     private ArrayMap<String, Preference> mPreferenceCache;
@@ -145,6 +146,7 @@
             Bundle savedInstanceState) {
         final View root = super.onCreateView(inflater, container, savedInstanceState);
         mPinnedHeaderFrameLayout = root.findViewById(R.id.pinned_header);
+        mAppBarLayout = getActivity().findViewById(R.id.app_bar);
         return root;
     }
 
@@ -250,7 +252,7 @@
             return;
         }
         if (mAdapter != null) {
-            mAdapter.requestHighlight(getView(), getListView());
+            mAdapter.requestHighlight(getView(), getListView(), mAppBarLayout);
         }
     }
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 48dd218..6d98f36 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -167,8 +167,8 @@
         mEm = (EthernetManager) getSystemService(Context.ETHERNET_SERVICE);
         mTm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE);
 
-        mUsbRegexs = mCm.getTetherableUsbRegexs();
-        mBluetoothRegexs = mCm.getTetherableBluetoothRegexs();
+        mUsbRegexs = mTm.getTetherableUsbRegexs();
+        mBluetoothRegexs = mTm.getTetherableBluetoothRegexs();
         mEthernetRegex = getContext().getResources().getString(
                 com.android.internal.R.string.config_ethernet_iface_regex);
 
@@ -251,14 +251,14 @@
         public void onReceive(Context content, Intent intent) {
             String action = intent.getAction();
             // TODO: stop using ACTION_TETHER_STATE_CHANGED and use mTetheringEventCallback instead.
-            if (action.equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) {
+            if (action.equals(TetheringManager.ACTION_TETHER_STATE_CHANGED)) {
                 // TODO - this should understand the interface types
                 ArrayList<String> available = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_AVAILABLE_TETHER);
+                        TetheringManager.EXTRA_AVAILABLE_TETHER);
                 ArrayList<String> active = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ACTIVE_TETHER);
+                        TetheringManager.EXTRA_ACTIVE_TETHER);
                 ArrayList<String> errored = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ERRORED_TETHER);
+                        TetheringManager.EXTRA_ERRORED_TETHER);
                 updateState(available.toArray(new String[available.size()]),
                         active.toArray(new String[active.size()]),
                         errored.toArray(new String[errored.size()]));
@@ -345,7 +345,7 @@
         final Activity activity = getActivity();
 
         mTetherChangeReceiver = new TetherChangeReceiver();
-        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        IntentFilter filter = new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED);
         final Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
 
         filter = new IntentFilter();
@@ -367,11 +367,10 @@
     }
 
     private void updateState() {
-        final ConnectivityManager cm =
-                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        final String[] available = cm.getTetherableIfaces();
-        final String[] tethered = cm.getTetheredIfaces();
-        final String[] errored = cm.getTetheringErroredIfaces();
+        final TetheringManager tm = getContext().getSystemService(TetheringManager.class);
+        final String[] available = tm.getTetherableIfaces();
+        final String[] tethered = tm.getTetheredIfaces();
+        final String[] errored = tm.getTetheringErroredIfaces();
         updateState(available, tethered, errored);
     }
 
@@ -391,7 +390,7 @@
             for (String regex : mUsbRegexs) {
                 if (s.matches(regex)) {
                     if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                        usbError = mCm.getLastTetherError(s);
+                        usbError = mTm.getLastTetherError(s);
                     }
                 }
             }
@@ -558,8 +557,8 @@
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     final List<String> keys = super.getNonIndexableKeys(context);
-                    final ConnectivityManager cm =
-                            context.getSystemService(ConnectivityManager.class);
+                    final TetheringManager tm =
+                            context.getSystemService(TetheringManager.class);
 
                     if (!TetherUtil.isTetherAvailable(context)) {
                         keys.add(KEY_TETHER_PREFS_SCREEN);
@@ -567,13 +566,13 @@
                     }
 
                     final boolean usbAvailable =
-                            cm.getTetherableUsbRegexs().length != 0;
+                            tm.getTetherableUsbRegexs().length != 0;
                     if (!usbAvailable || Utils.isMonkeyRunning()) {
                         keys.add(KEY_USB_TETHER_SETTINGS);
                     }
 
                     final boolean bluetoothAvailable =
-                            cm.getTetherableBluetoothRegexs().length != 0;
+                            tm.getTetherableBluetoothRegexs().length != 0;
                     if (!bluetoothAvailable) {
                         keys.add(KEY_ENABLE_BLUETOOTH_TETHERING);
                     }
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index d322819..5f72ca5 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -34,9 +34,9 @@
 import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
-import android.security.KeyStore;
-import android.security.keymaster.KeyCharacteristics;
-import android.security.keymaster.KeymasterDefs;
+import android.security.keystore.AndroidKeyStoreProvider;
+import android.security.keystore.KeyProperties;
+import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -55,13 +55,21 @@
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import javax.crypto.SecretKey;
+
 public class UserCredentialsSettings extends SettingsPreferenceFragment
         implements View.OnClickListener {
     private static final String TAG = "UserCredentialsSettings";
@@ -201,21 +209,19 @@
             }
 
             private void deleteWifiCredential(final Credential credential) {
-                final KeyStore keyStore = KeyStore.getInstance();
-                final EnumSet<Credential.Type> storedTypes = credential.getStoredTypes();
-
-                // Remove all Wi-Fi credentials
-                if (storedTypes.contains(Credential.Type.USER_KEY)) {
-                    keyStore.delete(Credentials.USER_PRIVATE_KEY + credential.getAlias(),
-                            Process.WIFI_UID);
-                }
-                if (storedTypes.contains(Credential.Type.USER_CERTIFICATE)) {
-                    keyStore.delete(Credentials.USER_CERTIFICATE + credential.getAlias(),
-                            Process.WIFI_UID);
-                }
-                if (storedTypes.contains(Credential.Type.CA_CERTIFICATE)) {
-                    keyStore.delete(Credentials.CA_CERTIFICATE + credential.getAlias(),
-                            Process.WIFI_UID);
+                try {
+                    KeyStore keyStore = null;
+                    if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                        keyStore = KeyStore.getInstance("AndroidKeyStore");
+                        keyStore.load(
+                                new AndroidKeyStoreLoadStoreParameter(
+                                        KeyProperties.NAMESPACE_WIFI));
+                    } else {
+                        keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                    }
+                    keyStore.deleteEntry(credential.getAlias());
+                } catch (Exception e) {
+                    throw new RuntimeException("Failed to delete keys from keystore.");
                 }
             }
 
@@ -266,73 +272,103 @@
          */
         @Override
         protected List<Credential> doInBackground(Void... params) {
-            final KeyStore keyStore = KeyStore.getInstance();
-
             // Certificates can be installed into SYSTEM_UID or WIFI_UID through CertInstaller.
             final int myUserId = UserHandle.myUserId();
             final int systemUid = UserHandle.getUid(myUserId, Process.SYSTEM_UID);
             final int wifiUid = UserHandle.getUid(myUserId, Process.WIFI_UID);
 
-            List<Credential> credentials = new ArrayList<>();
-            credentials.addAll(getCredentialsForUid(keyStore, systemUid).values());
-            credentials.addAll(getCredentialsForUid(keyStore, wifiUid).values());
-            return credentials;
-        }
+            try {
+                KeyStore processKeystore = KeyStore.getInstance("AndroidKeyStore");
+                processKeystore.load(null);
+                KeyStore wifiKeystore = null;
+                if (myUserId == 0) {
+                    // Only the primary user may see wifi configurations.
+                    if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                        wifiKeystore = KeyStore.getInstance("AndroidKeyStore");
+                        wifiKeystore.load(new AndroidKeyStoreLoadStoreParameter(
+                                KeyProperties.NAMESPACE_WIFI));
+                    } else {
+                        wifiKeystore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                    }
+                }
 
-        private boolean isAsymmetric(KeyStore keyStore, String alias, int uid)
-            throws UnrecoverableKeyException {
-                KeyCharacteristics keyCharacteristics = new KeyCharacteristics();
-                int errorCode = keyStore.getKeyCharacteristics(alias, null, null, uid,
-                        keyCharacteristics);
-                if (errorCode != KeyStore.NO_ERROR) {
-                    throw (UnrecoverableKeyException)
-                            new UnrecoverableKeyException("Failed to obtain information about key")
-                                    .initCause(KeyStore.getKeyStoreException(errorCode));
+                List<Credential> credentials = new ArrayList<>();
+                credentials.addAll(getCredentialsForUid(processKeystore, systemUid).values());
+                if (wifiKeystore != null) {
+                    credentials.addAll(getCredentialsForUid(wifiKeystore, wifiUid).values());
                 }
-                Integer keymasterAlgorithm = keyCharacteristics.getEnum(
-                        KeymasterDefs.KM_TAG_ALGORITHM);
-                if (keymasterAlgorithm == null) {
-                    throw new UnrecoverableKeyException("Key algorithm unknown");
-                }
-                return keymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_RSA ||
-                        keymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_EC;
+                return credentials;
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to load credentials from Keystore.", e);
+            }
         }
 
         private SortedMap<String, Credential> getCredentialsForUid(KeyStore keyStore, int uid) {
-            final SortedMap<String, Credential> aliasMap = new TreeMap<>();
-            for (final Credential.Type type : Credential.Type.values()) {
-                for (final String prefix : type.prefix) {
-                    for (final String alias : keyStore.list(prefix, uid)) {
-                        if (UserHandle.getAppId(uid) == Process.SYSTEM_UID) {
+            try {
+                final SortedMap<String, Credential> aliasMap = new TreeMap<>();
+                boolean isSystem = UserHandle.getAppId(uid) == Process.SYSTEM_UID;
+                Enumeration<String> aliases = keyStore.aliases();
+                while (aliases.hasMoreElements()) {
+                    String alias = aliases.nextElement();
+                    Credential c = new Credential(alias, uid);
+                    Key key = null;
+                    try {
+                        key = keyStore.getKey(alias, null);
+                    } catch (NoSuchAlgorithmException | UnrecoverableKeyException e) {
+                        Log.e(TAG, "Error tying to retrieve key: " + alias, e);
+                        continue;
+                    }
+                    if (key != null) {
+                        // So we have a key
+                        if (key instanceof SecretKey) {
+                            // We don't display any symmetric key entries.
+                            continue;
+                        }
+                        if (isSystem) {
                             // Do not show work profile keys in user credentials
                             if (alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT) ||
                                     alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_DECRYPT)) {
                                 continue;
                             }
                             // Do not show synthetic password keys in user credential
+                            // We should never reach this point because the synthetic password key
+                            // is symmetric.
                             if (alias.startsWith(LockPatternUtils.SYNTHETIC_PASSWORD_KEY_PREFIX)) {
                                 continue;
                             }
                         }
-                        try {
-                            if (type == Credential.Type.USER_KEY &&
-                                    !isAsymmetric(keyStore, prefix + alias, uid)) {
-                                continue;
+                        // At this point we have determined that we have an asymmetric key.
+                        // so we have at least a USER_KEY and USER_CERTIFICATE.
+                        c.storedTypes.add(Credential.Type.USER_KEY);
+
+                        Certificate[] certs =  keyStore.getCertificateChain(alias);
+                        if (certs != null) {
+                            c.storedTypes.add(Credential.Type.USER_CERTIFICATE);
+                            if (certs.length > 1) {
+                                c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
                             }
-                        } catch (UnrecoverableKeyException e) {
-                            Log.e(TAG, "Unable to determine algorithm of key: " + prefix + alias, e);
-                            continue;
                         }
-                        Credential c = aliasMap.get(alias);
-                        if (c == null) {
-                            c = new Credential(alias, uid);
-                            aliasMap.put(alias, c);
+                    } else {
+                        // So there is no key but we have an alias. This must mean that we have
+                        // some certificate.
+                        if (keyStore.isCertificateEntry(alias)) {
+                            c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
+                        } else {
+                            // This is a weired inconsistent case that should not exist.
+                            // Pure trusted certificate entries should be stored in CA_CERTIFICATE,
+                            // but if isCErtificateEntry returns null this means that only the
+                            // USER_CERTIFICATE is populated which should never be the case without
+                            // a private key. It can still be retrieved with
+                            // keystore.getCertificate().
+                            c.storedTypes.add(Credential.Type.USER_CERTIFICATE);
                         }
-                        c.storedTypes.add(type);
                     }
+                    aliasMap.put(alias, c);
                 }
+                return aliasMap;
+            } catch (KeyStoreException e) {
+                throw new RuntimeException("Failed to load credential from Android Keystore.", e);
             }
-            return aliasMap;
         }
 
         @Override
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 2206e81..dcf7897 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -35,6 +35,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
@@ -60,11 +61,19 @@
         return false;
     };
 
+    /**
+     * The interface to execute the uninstallation action.
+     */
+    interface UninstallActionPerformer {
+        void uninstallPackage();
+    }
+
     /** Returns a {@link Dialog} to be shown to confirm that they want to enable a service. */
-    public static Dialog createCapabilitiesDialog(Context context,
-            AccessibilityServiceInfo info, View.OnClickListener listener) {
+    public static Dialog createCapabilitiesDialog(@NonNull Context context,
+            @NonNull AccessibilityServiceInfo info, @NonNull View.OnClickListener listener,
+            @NonNull UninstallActionPerformer performer) {
         final AlertDialog ad = new AlertDialog.Builder(context)
-                .setView(createEnableDialogContentView(context, info, listener))
+                .setView(createEnableDialogContentView(context, info, listener, performer))
                 .create();
 
         Window window = ad.getWindow();
@@ -88,7 +97,8 @@
     }
 
     private static View createEnableDialogContentView(Context context,
-            AccessibilityServiceInfo info, View.OnClickListener listener) {
+            @NonNull AccessibilityServiceInfo info, View.OnClickListener listener,
+            UninstallActionPerformer performer) {
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
 
@@ -129,6 +139,14 @@
         permissionAllowButton.setOnTouchListener(filterTouchListener);
         permissionDenyButton.setOnClickListener(listener);
 
+        final Button uninstallButton = content.findViewById(
+                R.id.permission_enable_uninstall_button);
+        // Shows an uninstall button to help users quickly remove the non-system App due to the
+        // required permissions.
+        if (!AccessibilityUtil.isSystemApp(info)) {
+            uninstallButton.setVisibility(View.VISIBLE);
+            uninstallButton.setOnClickListener(v -> performer.uninstallPackage());
+        }
         return content;
     }
 
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index eb202b5..f547209 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -381,4 +381,13 @@
         return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, screenHeightDp,
                 resources.getDisplayMetrics()));
     }
+
+    /**
+     * Indicates if the accessibility service belongs to a system App.
+     * @param info AccessibilityServiceInfo
+     * @return {@code true} if the App is a system App.
+     */
+    public static boolean isSystemApp(@NonNull AccessibilityServiceInfo info) {
+        return info.getResolveInfo().serviceInfo.applicationInfo.isSystemApp();
+    }
 }
diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index 6b44a0a..0c1876f 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -38,7 +38,7 @@
     @Override
     protected void onInstallSwitchPreferenceToggleSwitch() {
         super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setVisible(false);
+        mToggleServiceSwitchPreference.setVisible(false);
     }
 
     /**
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index b2c3c4d..4db7857 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -36,15 +36,14 @@
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.Nullable;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import java.util.List;
 
 /** Fragment for providing open activity button. */
-public class LaunchAccessibilityActivityPreferenceFragment extends
-        ToggleFeaturePreferenceFragment {
+public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeaturePreferenceFragment {
     private static final String TAG = "LaunchA11yActivity";
     private static final String EMPTY_STRING = "";
 
@@ -52,7 +51,7 @@
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mToggleServiceDividerSwitchPreference.setSwitchVisibility(View.GONE);
+        mToggleServiceSwitchPreference.hide();
     }
 
     @Override
@@ -62,16 +61,6 @@
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            final boolean checked = ((DividerSwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     protected void onProcessArguments(Bundle arguments) {
         super.onProcessArguments(arguments);
 
@@ -111,7 +100,7 @@
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
         final String switchBarText = (info == null) ? EMPTY_STRING : getString(
                 R.string.accessibility_service_primary_open_title,
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 04491cc..7902ec6 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -24,10 +24,14 @@
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.net.Uri;
@@ -37,18 +41,21 @@
 import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.Switch;
 
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
@@ -58,7 +65,8 @@
 public class ToggleAccessibilityServicePreferenceFragment extends
         ToggleFeaturePreferenceFragment {
 
-    public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
+    private static final String TAG = "ToggleAccessibilityServicePreferenceFragment";
+    private static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
     private LockPatternUtils mLockPatternUtils;
     private AtomicBoolean mIsDialogShown = new AtomicBoolean(/* initialValue= */ false);
 
@@ -73,6 +81,7 @@
             };
 
     private Dialog mDialog;
+    private BroadcastReceiver mPackageRemovedReceiver;
 
     @Override
     public int getMetricsCategory() {
@@ -93,6 +102,17 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        final AccessibilityServiceInfo serviceInfo = getAccessibilityServiceInfo();
+        if (serviceInfo == null) {
+            getActivity().finishAndRemoveTask();
+        } else if (!AccessibilityUtil.isSystemApp(serviceInfo)) {
+            registerPackageRemoveReceiver();
+        }
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         updateSwitchBarToggleSwitch();
@@ -110,6 +130,7 @@
     // capabilities. For
     // example, before JellyBean MR2 the user was granting the explore by touch
     // one.
+    @Nullable
     AccessibilityServiceInfo getAccessibilityServiceInfo() {
         final List<AccessibilityServiceInfo> infos = AccessibilityManager.getInstance(
                 getPrefContext()).getInstalledAccessibilityServiceList();
@@ -135,7 +156,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromEnableToggleClicked);
+                                this::onDialogButtonFromEnableToggleClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.ENABLE_WARNING_FROM_SHORTCUT_TOGGLE: {
@@ -145,7 +167,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromShortcutToggleClicked);
+                                this::onDialogButtonFromShortcutToggleClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.ENABLE_WARNING_FROM_SHORTCUT: {
@@ -155,7 +178,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromShortcutClicked);
+                                this::onDialogButtonFromShortcutClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.DISABLE_WARNING_FROM_TOGGLE: {
@@ -198,7 +222,7 @@
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
         final String switchBarText = (info == null) ? "" :
                 getString(R.string.accessibility_service_primary_switch_title,
@@ -206,13 +230,14 @@
         switchPreference.setTitle(switchBarText);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getPrefContext())
                 .contains(mComponentName);
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 
     /**
@@ -244,6 +269,32 @@
         }
     }
 
+    private void registerPackageRemoveReceiver() {
+        if (mPackageRemovedReceiver != null || getContext() == null) {
+            return;
+        }
+        mPackageRemovedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final String packageName = intent.getData().getSchemeSpecificPart();
+                if (TextUtils.equals(mComponentName.getPackageName(), packageName)) {
+                    getActivity().finishAndRemoveTask();
+                }
+            }
+        };
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addDataScheme("package");
+        getContext().registerReceiver(mPackageRemovedReceiver, filter);
+    }
+
+    private void unregisterPackageRemoveReceiver() {
+        if (mPackageRemovedReceiver == null || getContext() == null) {
+            return;
+        }
+        getContext().unregisterReceiver(mPackageRemovedReceiver);
+        mPackageRemovedReceiver = null;
+    }
+
     private boolean isServiceSupportAccessibilityButton() {
         final AccessibilityManager ams = getPrefContext().getSystemService(
                 AccessibilityManager.class);
@@ -263,7 +314,7 @@
     }
 
     private void handleConfirmServiceEnabled(boolean confirmed) {
-        mToggleServiceDividerSwitchPreference.setChecked(confirmed);
+        mToggleServiceSwitchPreference.setChecked(confirmed);
         getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, confirmed);
         onPreferenceToggled(mPreferenceKey, confirmed);
     }
@@ -286,9 +337,10 @@
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(this::onPreferenceClick);
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (isChecked != mToggleServiceSwitchPreference.isChecked()) {
+            onPreferenceClick(mToggleServiceSwitchPreference);
+        }
     }
 
     @Override
@@ -296,7 +348,7 @@
         final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
-            if (!mToggleServiceDividerSwitchPreference.isChecked()) {
+            if (!mToggleServiceSwitchPreference.isChecked()) {
                 preference.setChecked(false);
                 showPopupDialog(DialogEnums.ENABLE_WARNING_FROM_SHORTCUT_TOGGLE);
             } else {
@@ -314,7 +366,7 @@
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
         final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
-                || mToggleServiceDividerSwitchPreference.isChecked();
+                || mToggleServiceSwitchPreference.isChecked();
         showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
                 : DialogEnums.ENABLE_WARNING_FROM_SHORTCUT);
     }
@@ -375,6 +427,35 @@
         }
     }
 
+    private void onDialogButtonFromUninstallClicked() {
+        mDialog.dismiss();
+        final Intent uninstallIntent = createUninstallPackageActivityIntent();
+        if (uninstallIntent == null) {
+            return;
+        }
+        startActivity(uninstallIntent);
+    }
+
+    @Nullable
+    private Intent createUninstallPackageActivityIntent() {
+        final AccessibilityServiceInfo a11yServiceInfo = getAccessibilityServiceInfo();
+        if (a11yServiceInfo == null) {
+            Log.w(TAG, "createUnInstallIntent -- invalid a11yServiceInfo");
+            return null;
+        }
+        final ApplicationInfo appInfo =
+                a11yServiceInfo.getResolveInfo().serviceInfo.applicationInfo;
+        final Uri packageUri = Uri.parse("package:" + appInfo.packageName);
+        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
+        return uninstallIntent;
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        unregisterPackageRemoveReceiver();
+    }
+
     private void onAllowButtonFromEnableToggleClicked() {
         if (isFullDiskEncrypted()) {
             final String title = createConfirmCredentialReasonMessage();
@@ -453,9 +534,14 @@
     }
 
     private boolean onPreferenceClick(Preference preference) {
-        boolean checked = ((DividerSwitchPreference) preference).isChecked();
+        boolean checked = ((SettingsMainSwitchPreference) preference).isChecked();
         if (checked) {
-            mToggleServiceDividerSwitchPreference.setChecked(false);
+            mToggleServiceSwitchPreference.setChecked(true);
+            getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
+                    /* enableService */ true);
+            showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
+        } else {
+            mToggleServiceSwitchPreference.setChecked(false);
             getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
                     /* disableService */ false);
             if (!mShortcutPreference.isChecked()) {
@@ -466,11 +552,6 @@
                     showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
                 }
             }
-        } else {
-            mToggleServiceDividerSwitchPreference.setChecked(true);
-            getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
-                    /* enableService */ true);
-            showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
         }
         return true;
     }
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index a45cd49..7fd30c6 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -31,15 +31,15 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.preference.SwitchPreference;
-
 import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /** Settings page for color inversion. */
-public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
+public class ToggleColorInversionPreferenceFragment extends
+        ToggleFeaturePreferenceFragment {
 
     private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
     private final Handler mHandler = new Handler();
@@ -64,26 +64,15 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_display_inversion_switch_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mComponentName = COLOR_INVERSION_COMPONENT_NAME;
@@ -128,11 +117,12 @@
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 }
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 3fb9b38..c12884b 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -33,11 +33,10 @@
 import android.view.ViewGroup;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
@@ -99,34 +98,19 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        updatePreferenceOrder();
     }
 
     /** Customizes the order by preference key. */
-    private List<String> getPreferenceOrderList() {
-        List<String> lists = new ArrayList<>();
-        lists.add(KEY_PREVIEW);
+    protected List<String> getPreferenceOrderList() {
+        final List<String> lists = new ArrayList<>();
         lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(KEY_PREVIEW);
         lists.add(KEY_CATEGORY_MODE);
         lists.add(KEY_GENERAL_CATEGORY);
         lists.add(KEY_INTRODUCTION_CATEGORY);
         return lists;
     }
 
-    private void updatePreferenceOrder() {
-        List<String> lists = getPreferenceOrderList();
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.setOrderingAsAdded(false);
-
-        final int size = lists.size();
-        for (int i = 0; i < size; i++) {
-            final Preference preference = preferenceScreen.findPreference(lists.get(i));
-            if (preference != null) {
-                preference.setOrder(i);
-            }
-        }
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -175,37 +159,27 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 87d07a8..ec22a28 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -40,20 +40,22 @@
 import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.Switch;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -66,9 +68,9 @@
  * and dialog management.
  */
 public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment
-        implements ShortcutPreference.OnClickCallback {
+        implements ShortcutPreference.OnClickCallback, OnMainSwitchChangeListener {
 
-    protected DividerSwitchPreference mToggleServiceDividerSwitchPreference;
+    protected SettingsMainSwitchPreference mToggleServiceSwitchPreference;
     protected ShortcutPreference mShortcutPreference;
     protected Preference mSettingsPreference;
     protected String mPreferenceKey;
@@ -88,6 +90,7 @@
     protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
+    protected static final String KEY_ANIMATED_IMAGE = "animated_image";
 
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
     private SettingsContentObserver mSettingsContentObserver;
@@ -153,7 +156,7 @@
         onProcessArguments(getArguments());
 
         initAnimatedImagePreference();
-        initToggleServiceDividerSwitchPreference();
+        initToggleServiceSwitchPreference();
         initGeneralCategory();
         initShortcutPreference();
         initSettingsPreference();
@@ -162,7 +165,7 @@
 
         installActionBarToggleSwitch();
 
-        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
+        updateToggleServiceTitle(mToggleServiceSwitchPreference);
 
         mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
             removeDialog(DialogEnums.EDIT_SHORTCUT);
@@ -178,6 +181,8 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
         switchBar.hide();
+
+        updatePreferenceOrder();
     }
 
     @Override
@@ -305,12 +310,17 @@
         removeActionBarToggleSwitch();
     }
 
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        onPreferenceToggled(mPreferenceKey, isChecked);
+    }
+
     /**
      * Returns the shortcut type list which has been checked by user.
      */
     abstract int getUserShortcutTypes();
 
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_service_primary_switch_title);
     }
 
@@ -318,18 +328,24 @@
 
     protected void onInstallSwitchPreferenceToggleSwitch() {
         // Implement this to set a checked listener.
+        updateSwitchBarToggleSwitch();
+        mToggleServiceSwitchPreference.addOnSwitchChangeListener(this);
     }
 
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         // Implement this to reset a checked listener.
     }
 
+    protected void updateSwitchBarToggleSwitch() {
+        // Implement this to update the state of switch.
+    }
+
     private void installActionBarToggleSwitch() {
         onInstallSwitchPreferenceToggleSwitch();
     }
 
     private void removeActionBarToggleSwitch() {
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
         onRemoveSwitchPreferenceToggleSwitch();
     }
 
@@ -361,6 +377,31 @@
         }
     }
 
+    /** Customizes the order by preference key. */
+    protected List<String> getPreferenceOrderList() {
+        final List<String> lists = new ArrayList<>();
+        lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(KEY_ANIMATED_IMAGE);
+        lists.add(KEY_GENERAL_CATEGORY);
+        lists.add(KEY_INTRODUCTION_CATEGORY);
+        return lists;
+    }
+
+    private void updatePreferenceOrder() {
+        final List<String> lists = getPreferenceOrderList();
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.setOrderingAsAdded(false);
+
+        final int size = lists.size();
+        for (int i = 0; i < size; i++) {
+            final Preference preference = preferenceScreen.findPreference(lists.get(i));
+            if (preference != null) {
+                preference.setOrder(i);
+            }
+        }
+    }
+
     private Drawable getDrawableFromUri(Uri imageUri) {
         if (mImageGetterCacheView == null) {
             mImageGetterCacheView = new ImageView(getPrefContext());
@@ -401,19 +442,20 @@
         animatedImagePreference.setImageUri(mImageUri);
         animatedImagePreference.setSelectable(false);
         animatedImagePreference.setMaxHeight(screenHalfHeight);
+        animatedImagePreference.setKey(KEY_ANIMATED_IMAGE);
 
         getPreferenceScreen().addPreference(animatedImagePreference);
     }
 
-    private void initToggleServiceDividerSwitchPreference() {
-        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
-        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+    private void initToggleServiceSwitchPreference() {
+        mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(getPrefContext());
+        mToggleServiceSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
         if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
             final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
-            mToggleServiceDividerSwitchPreference.setChecked(enabled);
+            mToggleServiceSwitchPreference.setChecked(enabled);
         }
 
-        getPreferenceScreen().addPreference(mToggleServiceDividerSwitchPreference);
+        getPreferenceScreen().addPreference(mToggleServiceSwitchPreference);
     }
 
     private void initGeneralCategory() {
@@ -598,7 +640,7 @@
      * This method will be invoked when a button in the edit shortcut dialog is clicked.
      *
      * @param dialog The dialog that received the click
-     * @param which The button that was clicked
+     * @param which  The button that was clicked
      */
     protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
         if (mComponentName == null) {
@@ -676,7 +718,7 @@
     }
 
     /**
-     *  Setups a configurable default if the setting has never been set.
+     * Setups a configurable default if the setting has never been set.
      */
     private static void setupDefaultShortcutIfNecessary(Context context) {
         final String targetKey = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index ca19681..09690d9 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -29,13 +29,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -44,6 +41,7 @@
 /** Settings for reducing brightness. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePreferenceFragment {
+
     private static final String REDUCE_BRIGHT_COLORS_ACTIVATED_KEY =
             Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED;
     private static final String KEY_INTENSITY = "rbc_intensity";
@@ -73,7 +71,7 @@
         mSettingsContentObserver = new SettingsContentObserver(mHandler, enableServiceFeatureKeys) {
             @Override
             public void onChange(boolean selfChange, Uri uri) {
-                    updateSwitchBarToggleSwitch();
+                updateSwitchBarToggleSwitch();
             }
         };
 
@@ -83,11 +81,10 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        updatePreferenceOrder();
     }
 
     /** Customizes the order by preference key. */
-    private List<String> getPreferenceOrderList() {
+    protected List<String> getPreferenceOrderList() {
         final List<String> lists = new ArrayList<>();
         lists.add(KEY_USE_SERVICE_PREFERENCE);
         lists.add(KEY_INTENSITY);
@@ -97,20 +94,6 @@
         return lists;
     }
 
-    private void updatePreferenceOrder() {
-        final List<String> lists = getPreferenceOrderList();
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.setOrderingAsAdded(false);
-
-        final int size = lists.size();
-        for (int i = 0; i < size; i++) {
-            final Preference preference = preferenceScreen.findPreference(lists.get(i));
-            if (preference != null) {
-                preference.setOrder(i);
-            }
-        }
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -151,41 +134,31 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(
                 /* onPreferenceClickListener= */ null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.reduce_bright_colors_preference_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(),
                 REDUCE_BRIGHT_COLORS_ACTIVATED_KEY, OFF) == ON;
         mRbcIntensityPreferenceController.updateState(getPreferenceScreen()
                 .findPreference(KEY_INTENSITY));
         mRbcPersistencePreferenceController.updateState(getPreferenceScreen()
                 .findPreference(KEY_PERSIST));
-        if (mToggleServiceDividerSwitchPreference.isChecked() != checked) {
-            mToggleServiceDividerSwitchPreference.setChecked(checked);
+        if (mToggleServiceSwitchPreference.isChecked() != checked) {
+            mToggleServiceSwitchPreference.setChecked(checked);
         }
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 8e14e5a..ff46722 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -304,8 +304,7 @@
 
     @Override
     protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setVisible(false);
+        mToggleServiceSwitchPreference.setVisible(false);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index bea528a..86ead5c 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -33,12 +33,12 @@
         // Log the final choice in value if it's different from the previous value.
         Bundle args = getArguments();
         if ((args != null) && args.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
-            if (mToggleServiceDividerSwitchPreference.isChecked() != args.getBoolean(
+            if (mToggleServiceSwitchPreference.isChecked() != args.getBoolean(
                     AccessibilitySettings.EXTRA_CHECKED)) {
                 // TODO: Distinguish between magnification modes
                 mMetricsFeatureProvider.action(getContext(),
                         SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION,
-                        mToggleServiceDividerSwitchPreference.isChecked());
+                        mToggleServiceSwitchPreference.isChecked());
             }
         }
         super.onStop();
diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 4d7b653..c0d54e8 100644
--- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -28,7 +28,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -39,10 +39,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
         super.onStop();
     }
diff --git a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
index 87b8469..4334cd0 100644
--- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -28,7 +28,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -39,10 +39,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 6e4a233..4337177 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -29,7 +29,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -40,10 +40,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
index 3dd648c..acdfdc9 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -29,7 +29,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -40,10 +40,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java b/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java
new file mode 100644
index 0000000..ccfc87e
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.List;
+
+/**
+ * Connects app op info to the ApplicationsState. Extends {@link AppStateAppOpsBridge} to tailor
+ * to the semantics of {@link Manifest.permission#SCHEDULE_EXACT_ALARM}.
+ * Also provides app filters that can use the info.
+ */
+public class AppStateAlarmsAndRemindersBridge extends AppStateAppOpsBridge {
+
+    private AppOpsManager mAppOpsManager;
+
+    public AppStateAlarmsAndRemindersBridge(Context context, ApplicationsState appState,
+            Callback callback) {
+        super(context, appState, callback,
+                AppOpsManager.strOpToOp(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM),
+                new String[]{Manifest.permission.SCHEDULE_EXACT_ALARM});
+
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    /**
+     * Returns information regarding {@link Manifest.permission#SCHEDULE_EXACT_ALARM} for the given
+     * package and uid.
+     */
+    public PermissionState createPermissionState(String packageName, int uid) {
+        final PermissionState permState = getPermissionInfo(packageName, uid);
+        permState.appOpMode = mAppOpsManager.unsafeCheckOpRawNoThrow(
+                AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM, uid, packageName);
+        return permState;
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = createPermissionState(pkg, uid);
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        final List<AppEntry> allApps = mAppSession.getAllApps();
+        for (int i = 0; i < allApps.size(); i++) {
+            final AppEntry currentEntry = allApps.get(i);
+            updateExtraInfo(currentEntry, currentEntry.info.packageName, currentEntry.info.uid);
+        }
+    }
+
+    public static final AppFilter FILTER_CLOCK_APPS = new AppFilter() {
+
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            if (info.extraInfo instanceof PermissionState) {
+                final PermissionState permissionState = (PermissionState) info.extraInfo;
+                return permissionState.permissionDeclared;
+            }
+            return false;
+        }
+    };
+
+}
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index b4f6e48..2ccdc78 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -277,7 +277,7 @@
             if (pe == null) {
                 Log.w(TAG, "AppOp permission exists for package " + packageOp.getPackageName()
                         + " of user " + userId + " but package doesn't exist or did not request "
-                        + mPermissions + " access");
+                        + Arrays.toString(mPermissions) + " access");
                 continue;
             }
 
diff --git a/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java b/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
new file mode 100644
index 0000000..95835cb
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications.appinfo;
+
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+
+import android.app.AppOpsManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+/**
+ * App specific activity to show details about
+ * {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
+ */
+public class AlarmsAndRemindersDetails extends AppInfoWithHeader
+        implements OnPreferenceChangeListener {
+
+    private static final String KEY_SWITCH = "alarms_and_reminders_switch";
+
+    private AppStateAlarmsAndRemindersBridge mAppBridge;
+    private AppOpsManager mAppOpsManager;
+    private RestrictedSwitchPreference mSwitchPref;
+    private AppStateAppOpsBridge.PermissionState mPermissionState;
+
+    /**
+     * Returns the string that states whether the app has access to
+     * {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
+     */
+    public static int getSummary(Context context, AppEntry entry) {
+        final AppStateAppOpsBridge.PermissionState state;
+        if (entry.extraInfo instanceof AppStateAppOpsBridge.PermissionState) {
+            state = (AppStateAppOpsBridge.PermissionState) entry.extraInfo;
+        } else {
+            state = new AppStateAlarmsAndRemindersBridge(context, /*appState=*/null,
+                    /*callback=*/null).createPermissionState(entry.info.packageName,
+                    entry.info.uid);
+        }
+
+        return state.isPermissible() ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Context context = getActivity();
+        mAppBridge = new AppStateAlarmsAndRemindersBridge(context, mState, /*callback=*/null);
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+
+        addPreferencesFromResource(R.xml.alarms_and_reminders);
+        mSwitchPref = findPreference(KEY_SWITCH);
+        mSwitchPref.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean checked = (Boolean) newValue;
+        if (preference == mSwitchPref) {
+            if (mPermissionState != null && checked != mPermissionState.isPermissible()) {
+                if (Settings.AlarmsAndRemindersAppActivity.class.getName().equals(
+                        getIntent().getComponent().getClassName())) {
+                    setResult(checked ? RESULT_OK : RESULT_CANCELED);
+                }
+                setCanScheduleAlarms(checked);
+                logPermissionChange(checked, mPackageName);
+                refreshUi();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private void setCanScheduleAlarms(boolean newState) {
+        mAppOpsManager.setUidMode(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM,
+                mPackageInfo.applicationInfo.uid,
+                newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
+    }
+
+    private void logPermissionChange(boolean newState, String packageName) {
+        mMetricsFeatureProvider.action(
+                mMetricsFeatureProvider.getAttribution(getActivity()),
+                SettingsEnums.ACTION_ALARMS_AND_REMINDERS_TOGGLE,
+                getMetricsCategory(),
+                packageName,
+                newState ? 1 : 0);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
+            return false;
+        }
+        mPermissionState = mAppBridge.createPermissionState(mPackageName,
+                mPackageInfo.applicationInfo.uid);
+        mSwitchPref.setEnabled(mPermissionState.permissionDeclared);
+        mSwitchPref.setChecked(mPermissionState.isPermissible());
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ALARMS_AND_REMINDERS;
+    }
+}
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 1f8b9d1..e53334d 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.text.TextUtils;
 
@@ -45,9 +46,11 @@
     private PreferenceScreen mScreen;
     private Preference mPreference;
     private SettingObserver mSettingObserver;
+    private Context mContext;
 
     public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
+        mContext = context;
         mSettingObserver = new SettingObserver();
         mAssistUtils = new AssistUtils(context);
         mHelper = new VoiceInputHelper(context);
@@ -59,13 +62,8 @@
 
     @Override
     public boolean isAvailable() {
-        // If current assist is also voice service, don't show voice preference.
-        final ComponentName currentVoiceService =
-                DefaultVoiceInputPicker.getCurrentService(mHelper);
-        final ComponentName currentAssist =
-                mAssistUtils.getAssistComponentForUser(mUserId);
-        return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
-                currentAssist, currentVoiceService);
+        return mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_VOICE_RECOGNIZERS);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index b370ad2..f4de226 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -19,6 +19,7 @@
 import androidx.annotation.IntDef;
 
 import com.android.settings.R;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateManageExternalStorageBridge;
 import com.android.settings.applications.AppStateNotificationBridge;
@@ -50,6 +51,7 @@
             FILTER_APPS_WRITE_SETTINGS,
             FILTER_APPS_INSTALL_SOURCES,
             FILTER_APPS_BLOCKED,
+            FILTER_ALARMS_AND_REMINDERS,
     })
     @interface FilterType {
     }
@@ -73,6 +75,7 @@
     public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 15;
     public static final int FILTER_APPS_BLOCKED = 16;
     public static final int FILTER_MANAGE_EXTERNAL_STORAGE = 17;
+    public static final int FILTER_ALARMS_AND_REMINDERS = 18;
     // Next id: 18. If you add an entry here, length of mFilters should be updated
 
     private static AppFilterRegistry sRegistry;
@@ -80,7 +83,7 @@
     private final AppFilterItem[] mFilters;
 
     private AppFilterRegistry() {
-        mFilters = new AppFilterItem[18];
+        mFilters = new AppFilterItem[19];
 
         // High power allowlist, on
         mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
@@ -185,6 +188,12 @@
                 AppStateManageExternalStorageBridge.FILTER_MANAGE_EXTERNAL_STORAGE,
                 FILTER_MANAGE_EXTERNAL_STORAGE,
                 R.string.filter_manage_external_storage);
+
+        // Apps that can schedule alarms and reminders
+        mFilters[FILTER_ALARMS_AND_REMINDERS] = new AppFilterItem(
+                AppStateAlarmsAndRemindersBridge.FILTER_CLOCK_APPS,
+                FILTER_ALARMS_AND_REMINDERS,
+                R.string.alarms_and_reminders_title);
     }
 
     public static AppFilterRegistry getInstance() {
@@ -213,6 +222,8 @@
                 return FILTER_APPS_RECENT;
             case ManageApplications.LIST_MANAGE_EXTERNAL_STORAGE:
                 return FILTER_MANAGE_EXTERNAL_STORAGE;
+            case ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS:
+                return FILTER_ALARMS_AND_REMINDERS;
             default:
                 return FILTER_APPS_ALL;
         }
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 707e6f4..2dadbbc 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -91,6 +91,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateBaseBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
@@ -104,6 +105,7 @@
 import com.android.settings.applications.AppStateWriteSettingsBridge;
 import com.android.settings.applications.AppStorageSettings;
 import com.android.settings.applications.UsageAccessDetails;
+import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
@@ -230,6 +232,7 @@
     public static final int LIST_TYPE_PHOTOGRAPHY = 11;
     public static final int LIST_TYPE_WIFI_ACCESS = 13;
     public static final int LIST_MANAGE_EXTERNAL_STORAGE = 14;
+    public static final int LIST_TYPE_ALARMS_AND_REMINDERS = 15;
 
     // List types that should show instant apps.
     public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -321,6 +324,9 @@
         } else if (className.equals(Settings.ManageExternalStorageActivity.class.getName())) {
             mListType = LIST_MANAGE_EXTERNAL_STORAGE;
             screenTitle = R.string.manage_external_storage_title;
+        } else if (className.equals(Settings.AlarmsAndRemindersActivity.class.getName())) {
+            mListType = LIST_TYPE_ALARMS_AND_REMINDERS;
+            screenTitle = R.string.alarms_and_reminders_title;
         } else if (className.equals(Settings.NotificationAppListActivity.class.getName())) {
             mListType = LIST_TYPE_NOTIFICATION;
             mUsageStatsManager = IUsageStatsManager.Stub.asInterface(
@@ -545,6 +551,8 @@
                 return SettingsEnums.CONFIGURE_WIFI;
             case LIST_MANAGE_EXTERNAL_STORAGE:
                 return SettingsEnums.MANAGE_EXTERNAL_STORAGE;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                return SettingsEnums.ALARMS_AND_REMINDERS;
             default:
                 return SettingsEnums.PAGE_UNKNOWN;
         }
@@ -666,6 +674,10 @@
                 startAppInfoFragment(ManageExternalStorageDetails.class,
                         R.string.manage_external_storage_title);
                 break;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                startAppInfoFragment(AlarmsAndRemindersDetails.class,
+                        R.string.alarms_and_reminders_label);
+                break;
             // TODO: Figure out if there is a way where we can spin up the profile's settings
             // process ahead of time, to avoid a long load of data when user clicks on a managed
             // app. Maybe when they load the list of apps that contains managed profile apps.
@@ -744,6 +756,8 @@
                 return R.string.help_uri_apps_wifi_access;
             case LIST_MANAGE_EXTERNAL_STORAGE:
                 return R.string.help_uri_manage_external_storage;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                return R.string.help_uri_alarms_and_reminders;
             default:
             case LIST_TYPE_MAIN:
                 return R.string.help_uri_apps;
@@ -1066,6 +1080,8 @@
                 mExtraInfoBridge = new AppStateChangeWifiStateBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_MANAGE_EXTERNAL_STORAGE) {
                 mExtraInfoBridge = new AppStateManageExternalStorageBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_ALARMS_AND_REMINDERS) {
+                mExtraInfoBridge = new AppStateAlarmsAndRemindersBridge(mContext, mState, this);
             } else {
                 mExtraInfoBridge = null;
             }
@@ -1527,6 +1543,9 @@
                 case LIST_MANAGE_EXTERNAL_STORAGE:
                     holder.setSummary(ManageExternalStorageDetails.getSummary(mContext, entry));
                     break;
+                case LIST_TYPE_ALARMS_AND_REMINDERS:
+                    holder.setSummary(AlarmsAndRemindersDetails.getSummary(mContext, entry));
+                    break;
                 default:
                     holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
                     break;
diff --git a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java b/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java
deleted file mode 100644
index b893b88..0000000
--- a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.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.applications.specialaccess;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-
-public class HighPowerAppsController extends BasePreferenceController {
-
-    public HighPowerAppsController(Context context, String key) {
-        super(context, key);
-    }
-
-    @AvailabilityStatus
-    public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java
new file mode 100644
index 0000000..4fc5fc6
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
+
+import android.content.Context;
+
+public class AlertingTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "AlertFilterPrefCntlr";
+
+    public AlertingTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_ALERTING;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
index 9186bdb1..7ff3c9c 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
@@ -20,6 +20,7 @@
 import android.service.notification.NotificationListenerFilter;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -130,9 +131,9 @@
             }
             final String prefKey = entry.info.packageName + "|" + entry.info.uid;
             appsKeySet.add(prefKey);
-            SwitchPreference preference = mScreen.findPreference(prefKey);
+            CheckBoxPreference preference = mScreen.findPreference(prefKey);
             if (preference == null) {
-                preference = new SwitchPreference(mScreen.getContext());
+                preference = new CheckBoxPreference(mScreen.getContext());
                 preference.setIcon(entry.icon);
                 preference.setTitle(entry.label);
                 preference.setKey(prefKey);
@@ -172,7 +173,7 @@
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof SwitchPreference) {
+        if (preference instanceof CheckBoxPreference) {
             String packageName = preference.getKey().substring(0, preference.getKey().indexOf("|"));
             int uid = Integer.parseInt(preference.getKey().substring(
                     preference.getKey().indexOf("|") + 1));
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java
new file mode 100644
index 0000000..5a463ed
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+
+import android.content.Context;
+
+public class ConversationTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "ConvFilterPrefCntlr";
+
+    public ConversationTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_CONVERSATIONS;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index 41a6efa..a205b57 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -21,6 +21,7 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -49,7 +50,9 @@
 import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -60,6 +63,7 @@
     private NotificationListenerFilter mNlf;
     private ComponentName mComponentName;
     private CharSequence mServiceName;
+    protected ServiceInfo mServiceInfo;
     protected PackageInfo mPackageInfo;
     protected int mUserId;
     protected String mPackageName;
@@ -96,10 +100,18 @@
                 .setPackageInfo(mPackageInfo)
                 .setPm(context.getPackageManager())
                 .setServiceName(mServiceName);
-        use(TypeFilterPreferenceController.class)
-                .setNm(new NotificationBackend())
-                .setCn(mComponentName)
-                .setUserId(mUserId);
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.setNm(new NotificationBackend())
+                            .setCn(mComponentName)
+                            .setServiceInfo(mServiceInfo)
+                            .setUserId(mUserId);
+                }
+            });
+        });
     }
 
     @Override
@@ -205,20 +217,34 @@
     // along to keep business logic out of this file
     public void disable(final ComponentName cn) {
         final PreferenceScreen screen = getPreferenceScreen();
-        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
-        controller.disable(cn);
-        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
-        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
-        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
+        ApprovalPreferenceController apc = use(ApprovalPreferenceController.class);
+        apc.disable(cn);
+        apc.updateState(screen.findPreference(apc.getPreferenceKey()));
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.updateState(screen.findPreference(tfpc.getPreferenceKey()));
+                }
+            });
+        });
     }
 
     protected void enable(ComponentName cn) {
         final PreferenceScreen screen = getPreferenceScreen();
-        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
-        controller.enable(cn);
-        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
-        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
-        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
+        ApprovalPreferenceController apc = use(ApprovalPreferenceController.class);
+        apc.enable(cn);
+        apc.updateState(screen.findPreference(apc.getPreferenceKey()));
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.updateState(screen.findPreference(tfpc.getPreferenceKey()));
+                }
+            });
+        });
     }
 
     // To save binder calls, load this in the fragment rather than each preference controller
@@ -239,6 +265,7 @@
                 if (Objects.equals(mComponentName, info.getComponentName())) {
                     mIsNls = true;
                     mServiceName = info.loadLabel(mPm);
+                    mServiceInfo = info;
                     break;
                 }
             }
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS b/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
new file mode 100644
index 0000000..4338198
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+beverlyt@google.com
+dsandler@android.com
+juliacr@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java
new file mode 100644
index 0000000..6192a04
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+
+import android.content.Context;
+
+public class OngoingTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "OngoingFilterPrefCntlr";
+
+    public OngoingTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_ONGOING;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java
new file mode 100644
index 0000000..fab3b7b
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import android.content.Context;
+
+public class SilentTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "SilentFilterPrefCntlr";
+
+    public SilentTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_SILENT;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
index 9d7fcc1..a5ac1e1 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
@@ -16,35 +16,31 @@
 
 package com.android.settings.applications.specialaccess.notificationaccess;
 
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
-
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ServiceInfo;
 import android.service.notification.NotificationListenerFilter;
+import android.service.notification.NotificationListenerService;
+import android.text.TextUtils;
 
-import androidx.preference.MultiSelectListPreference;
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.notification.NotificationBackend;
 
-import java.util.HashSet;
-import java.util.Set;
-
-public class TypeFilterPreferenceController extends BasePreferenceController implements
+public abstract class TypeFilterPreferenceController extends BasePreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "TypeFilterPrefCntlr";
+    private static final String XML_SEPARATOR = ",";
 
     private ComponentName mCn;
     private int mUserId;
     private NotificationBackend mNm;
     private NotificationListenerFilter mNlf;
+    private ServiceInfo mSi;
 
     public TypeFilterPreferenceController(Context context, String key) {
         super(context, key);
@@ -65,6 +61,13 @@
         return this;
     }
 
+    public TypeFilterPreferenceController setServiceInfo(ServiceInfo si) {
+        mSi = si;
+        return this;
+    }
+
+    abstract protected int getType();
+
     @Override
     public int getAvailabilityStatus() {
         if (mNm.isNotificationListenerAccessGranted(mCn)) {
@@ -74,71 +77,62 @@
         }
     }
 
-    @Override
-    public void updateState(Preference pref) {
-        mNlf = mNm.getListenerFilter(mCn, mUserId);
-        Set<String> values = new HashSet<>();
-        Set<String> entries = new HashSet<>();
-
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_ONGOING));
-            entries.add(mContext.getString(R.string.notif_type_ongoing));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_CONVERSATIONS));
-            entries.add(mContext.getString(R.string.notif_type_conversation));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_ALERTING));
-            entries.add(mContext.getString(R.string.notif_type_alerting));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_SILENT));
-            entries.add(mContext.getString(R.string.notif_type_silent));
-        }
-
-        final MultiSelectListPreference preference = (MultiSelectListPreference) pref;
-        preference.setValues(values);
-        super.updateState(preference);
-        pref.setEnabled(getAvailabilityStatus() == AVAILABLE);
-    }
-
     private boolean hasFlag(int value, int flag) {
         return (value & flag) != 0;
     }
 
-    public CharSequence getSummary() {
-        Set<String> entries = new HashSet<>();
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
-            entries.add(mContext.getString(R.string.notif_type_ongoing));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
-            entries.add(mContext.getString(R.string.notif_type_conversation));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
-            entries.add(mContext.getString(R.string.notif_type_alerting));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
-            entries.add(mContext.getString(R.string.notif_type_silent));
-        }
-        return String.join(System.lineSeparator(), entries);
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         // retrieve latest in case the package filter has changed
         mNlf = mNm.getListenerFilter(mCn, mUserId);
 
-        Set<String> set = (Set<String>) newValue;
+        boolean enabled = (boolean) newValue;
 
-        int newFilter = 0;
-        for (String filterType : set) {
-            newFilter |= Integer.parseInt(filterType);
+        int newFilter = mNlf.getTypes();
+        if (enabled) {
+            newFilter |= getType();
+        } else {
+            newFilter &= ~getType();
         }
         mNlf.setTypes(newFilter);
-        preference.setSummary(getSummary());
         mNm.setListenerFilter(mCn, mUserId, mNlf);
         return true;
     }
 
+    @Override
+    public void updateState(Preference pref) {
+        mNlf = mNm.getListenerFilter(mCn, mUserId);
+
+        CheckBoxPreference check = (CheckBoxPreference) pref;
+        check.setChecked(hasFlag(mNlf.getTypes(), getType()));
+
+        boolean disableRequestedByApp = false;
+        if (mSi != null) {
+            if (mSi.metaData != null && mSi.metaData.containsKey(
+                    NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES)) {
+                String typeList = mSi.metaData.get(
+                        NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES).toString();
+                if (typeList != null) {
+                    int types = 0;
+                    String[] typeStrings = typeList.split(XML_SEPARATOR);
+                    for (int i = 0; i < typeStrings.length; i++) {
+                        if (TextUtils.isEmpty(typeStrings[i])) {
+                            continue;
+                        }
+                        try {
+                            types |= Integer.parseInt(typeStrings[i]);
+                        } catch (NumberFormatException e) {
+                            // skip
+                        }
+                    }
+                    if (hasFlag(types, getType())) {
+                        disableRequestedByApp = true;
+                    }
+                }
+            }
+        }
+        // Apps can prevent a category from being turned on, but not turned off
+        boolean disabledByApp = disableRequestedByApp && !check.isChecked();
+        pref.setEnabled(getAvailabilityStatus() == AVAILABLE && !disabledByApp);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 78abb58..1b2a6a5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -144,12 +144,7 @@
         mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType();
 
         if (mCanAssumeUdfps) {
-            // Use a custom layout since animations, etc must be based off of the sensor's physical
-            // location.
             setContentView(R.layout.udfps_enroll_enrolling);
-            final UdfpsEnrollLayout udfpsEnrollLayout = (UdfpsEnrollLayout) getLayoutInflater()
-                    .inflate(R.layout.udfps_enroll_layout, null /* root */);
-            getLayout().addView(udfpsEnrollLayout);
         } else {
             setContentView(R.layout.fingerprint_enroll_enrolling);
         }
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index 8097adc..394b673 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -37,11 +37,6 @@
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
 
     @Override
-    protected int getContentView() {
-        return R.layout.fingerprint_enroll_find_sensor;
-    }
-
-    @Override
     protected Intent getFingerprintEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
deleted file mode 100644
index 7923d27..0000000
--- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.biometrics.fingerprint;
-
-import android.content.Context;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-
-public class UdfpsEnrollLayout extends LinearLayout {
-
-    private static final String TAG = "UdfpsEnrollLayout";
-
-    public UdfpsEnrollLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index dcaeffe..aacf41f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -297,6 +297,7 @@
             preference.setEnabled(false);
             preference.setKey(KEY_BOTTOM_PREFERENCE);
             preference.setOrder(ORDINAL);
+            preference.setSelectable(false);
             mProfilesContainer.addPreference(preference);
         }
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index 5b74ce7..27f10da 100644
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -23,7 +23,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.location.ScanningSettings;
+import com.android.settings.location.LocationServices;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settings.widget.SwitchWidgetController;
@@ -100,7 +100,7 @@
     public void onClick(View v) {
         // send users to scanning settings if they click on the link in the summary text
         new SubSettingLauncher(mContext)
-                .setDestination(ScanningSettings.class.getName())
+                .setDestination(LocationServices.class.getName())
                 .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT)
                 .launch();
     }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 245389e..bc2582e 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.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.applications.UsageAccessDetails;
+import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
@@ -110,8 +111,8 @@
 import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.localepicker.LocaleListEditor;
+import com.android.settings.location.LocationServices;
 import com.android.settings.location.LocationSettings;
-import com.android.settings.location.ScanningSettings;
 import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.network.NetworkProviderSettings;
@@ -200,7 +201,7 @@
             NotificationStation.class.getName(),
             LocationSettings.class.getName(),
             PrivacyDashboardFragment.class.getName(),
-            ScanningSettings.class.getName(),
+            LocationServices.class.getName(),
             SecuritySettings.class.getName(),
             UsageAccessDetails.class.getName(),
             PrivacySettings.class.getName(),
@@ -313,7 +314,8 @@
             InteractAcrossProfilesSettings.class.getName(),
             InteractAcrossProfilesDetails.class.getName(),
             MediaControlsSettings.class.getName(),
-            NetworkProviderSettings.class.getName()
+            NetworkProviderSettings.class.getName(),
+            AlarmsAndRemindersDetails.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/datausage/OWNERS b/src/com/android/settings/datausage/OWNERS
index 49449ec..1ec66b3 100644
--- a/src/com/android/settings/datausage/OWNERS
+++ b/src/com/android/settings/datausage/OWNERS
@@ -1,5 +1,6 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
-goldmanj@google.com
 bonianchen@google.com
+goldmanj@google.com
+songferngwang@google.com
 wengsu@google.com
diff --git a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
index 78352d3..d5d4025 100644
--- a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
@@ -122,7 +122,7 @@
     private float findPeakRefreshRate(Display.Mode[] modes) {
         float peakRefreshRate = DEFAULT_REFRESH_RATE;
         for (Display.Mode mode : modes) {
-            if (Math.round(mode.getRefreshRate()) > DEFAULT_REFRESH_RATE) {
+            if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
                 peakRefreshRate = mode.getRefreshRate();
             }
         }
diff --git a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
index 08a450b..39e2276 100644
--- a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
+++ b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
@@ -97,10 +97,14 @@
             radioButton.setText(mRadioButtonStrings.get(i));
             radioButton.setEnabled(selectableIndex.contains(i));
         }
-        // View will be invisible when all options are enabled.
+        // Initial help information text view
+        final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
         if (selectableIndex.size() == mRadioButtonIds.size()) {
-            final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
+            // View will be invisible when all options are enabled.
             helpTextView.setVisibility(View.GONE);
+        } else {
+            helpTextView.setText(R.string.bluetooth_select_a2dp_codec_type_help_info);
+            helpTextView.setVisibility(View.VISIBLE);
         }
     }
 
diff --git a/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
new file mode 100644
index 0000000..e51f8ad
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller (in the Media transcoding settings) indicating the user's preference to show
+ * or hide the transcoding notifications.
+ */
+public class TranscodeNotificationPreferenceController extends TogglePreferenceController {
+    @VisibleForTesting
+    static final String TRANSCODE_NOTIFICATION_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_notification";
+
+    public TranscodeNotificationPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, true);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, String.valueOf(isChecked));
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS
index e6569f4..68cee36 100644
--- a/src/com/android/settings/deviceinfo/OWNERS
+++ b/src/com/android/settings/deviceinfo/OWNERS
@@ -1,7 +1,8 @@
 # Default reviewers for this and subdirectories.
+allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
 goldmanj@google.com
-allenwtsu@google.com
+songferngwang@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 10cab1c..36e085a 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -129,10 +129,11 @@
         mDeviceConfigDisplaySettings.stopListening();
     }
 
-    private float findPeakRefreshRate(Display.Mode[] modes) {
+    @VisibleForTesting
+    float findPeakRefreshRate(Display.Mode[] modes) {
         float peakRefreshRate = DEFAULT_REFRESH_RATE;
         for (Display.Mode mode : modes) {
-            if (Math.round(mode.getRefreshRate()) > DEFAULT_REFRESH_RATE) {
+            if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
                 peakRefreshRate = mode.getRefreshRate();
             }
         }
diff --git a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
index a966ab3..b6135ab 100644
--- a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.settings.emergency;
 
 import android.content.Context;
-import android.provider.Settings;
 import android.widget.Switch;
 
 import androidx.annotation.VisibleForTesting;
@@ -26,6 +25,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
 import com.android.settingslib.widget.MainSwitchPreference;
 import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
@@ -36,16 +36,13 @@
         OnMainSwitchChangeListener {
 
     @VisibleForTesting
-    static final int ON = 1;
-    @VisibleForTesting
-    static final int OFF = 0;
-
-    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
+    EmergencyNumberUtils mEmergencyNumberUtils;
 
     private MainSwitchPreference mSwitchBar;
 
     public EmergencyGesturePreferenceController(Context context, String key) {
         super(context, key);
+        mEmergencyNumberUtils = new EmergencyNumberUtils(context);
     }
 
     @Override
@@ -71,11 +68,11 @@
 
     @VisibleForTesting
     public boolean isChecked() {
-        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
+        return mEmergencyNumberUtils.getEmergencyGestureEnabled();
     }
 
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, isChecked ? ON : OFF);
+        mEmergencyNumberUtils.setEmergencyGestureEnabled(isChecked);
     }
 }
diff --git a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
index d5896d8..f9fb647 100644
--- a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
@@ -17,12 +17,12 @@
 package com.android.settings.emergency;
 
 import android.content.Context;
-import android.provider.Settings;
 
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
 
 /**
  * Preference controller for emergency sos gesture setting
@@ -30,14 +30,11 @@
 public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
 
     @VisibleForTesting
-    static final int ON = 1;
-    @VisibleForTesting
-    static final int OFF = 0;
-
-    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
+    EmergencyNumberUtils mEmergencyNumberUtils;
 
     public EmergencyGestureSoundPreferenceController(Context context, String key) {
         super(context, key);
+        mEmergencyNumberUtils = new EmergencyNumberUtils(context);
     }
 
     private static boolean isGestureAvailable(Context context) {
@@ -57,12 +54,12 @@
 
     @Override
     public boolean isChecked() {
-        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
+        return mEmergencyNumberUtils.getEmergencyGestureSoundEnabled();
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
-                isChecked ? ON : OFF);
+        mEmergencyNumberUtils.setEmergencySoundEnabled(isChecked);
+        return true;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 11d7564..4415e71 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -25,11 +25,6 @@
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceFragmentCompat;
@@ -39,14 +34,12 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.utils.AnnotationSpan;
 import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.HelpUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.UsageProgressBarPreference;
 
 /**
  * Controller that update the battery header view
@@ -57,23 +50,18 @@
     @VisibleForTesting
     static final String KEY_BATTERY_HEADER = "battery_header";
     private static final String ANNOTATION_URL = "url";
+    private static final int BATTERY_MAX_LEVEL = 100;
 
     @VisibleForTesting
     BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
     @VisibleForTesting
-    BatteryMeterView mBatteryMeterView;
-    @VisibleForTesting
-    TextView mBatteryPercentText;
-    @VisibleForTesting
-    TextView mSummary1;
+    UsageProgressBarPreference mBatteryUsageProgressBarPref;
 
     private Activity mActivity;
     private PreferenceFragmentCompat mHost;
     private Lifecycle mLifecycle;
     private final PowerManager mPowerManager;
 
-    private LayoutPreference mBatteryLayoutPref;
-
     public BatteryHeaderPreferenceController(Context context, String key) {
         super(context, key);
         mPowerManager = context.getSystemService(PowerManager.class);
@@ -96,16 +84,12 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mBatteryLayoutPref = screen.findPreference(getPreferenceKey());
-        mBatteryMeterView = mBatteryLayoutPref
-                .findViewById(R.id.battery_header_icon);
-        mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
-        mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
+        mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
 
         if (com.android.settings.Utils.isBatteryPresent(mContext)) {
             quickUpdateHeaderPreference();
         } else {
-            showHelpMessage();
+            //TODO(b/179237551): Make new progress bar widget support help message
         }
     }
 
@@ -116,8 +100,7 @@
 
     @Override
     public void onStart() {
-        EntityHeaderController.newInstance(mActivity, mHost,
-                mBatteryLayoutPref.findViewById(R.id.battery_entity_header))
+        EntityHeaderController.newInstance(mActivity, mHost, null /* header view */)
                 .setRecyclerView(mHost.getListView(), mLifecycle)
                 .styleActionBar(mActivity);
     }
@@ -133,21 +116,20 @@
     }
 
     public void updateHeaderPreference(BatteryInfo info) {
-        mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
-        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
-            mSummary1.setText(generateLabel(info));
-        }
 
-        mBatteryMeterView.setBatteryLevel(info.batteryLevel);
-        mBatteryMeterView.setCharging(!info.discharging);
-        mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
+        //TODO(b/179237746): Make progress bar widget support battery state icon
+
+        mBatteryUsageProgressBarPref.setUsageSummary(
+                formatBatteryPercentageText(info.batteryLevel));
+        mBatteryUsageProgressBarPref.setTotalSummary(generateLabel(info));
+        mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
     }
 
     /**
      * Callback which receives text for the summary line.
      */
     public void updateBatteryStatus(String label, BatteryInfo info) {
-        mSummary1.setText(label != null ? label : generateLabel(info));
+        mBatteryUsageProgressBarPref.setTotalSummary(label != null ? label : generateLabel(info));
     }
 
     public void quickUpdateHeaderPreference() {
@@ -157,37 +139,10 @@
         final boolean discharging =
                 batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
 
-        // Set battery level and charging status
-        mBatteryMeterView.setBatteryLevel(batteryLevel);
-        mBatteryMeterView.setCharging(!discharging);
-        mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
-        mBatteryPercentText.setText(formatBatteryPercentageText(batteryLevel));
-    }
+        //TODO(b/179237746): Make progress bar widget support battery state icon
 
-    @VisibleForTesting
-    void showHelpMessage() {
-        final LinearLayout batteryInfoLayout =
-                mBatteryLayoutPref.findViewById(R.id.battery_info_layout);
-        // Remove battery meter icon
-        mBatteryMeterView.setVisibility(View.GONE);
-        // Update the width of battery info layout
-        final ViewGroup.LayoutParams params = batteryInfoLayout.getLayoutParams();
-        params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
-        batteryInfoLayout.setLayoutParams(params);
-        mBatteryPercentText.setText(mContext.getText(R.string.unknown));
-        // Add linkable text for learn more
-        final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
-                mContext.getString(R.string.help_url_battery_missing),
-                mContext.getClass().getName());
-        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan
-                .LinkInfo(mContext, ANNOTATION_URL, helpIntent);
-        if (linkInfo.isActionable()) {
-            mSummary1.setMovementMethod(LinkMovementMethod.getInstance());
-            mSummary1.setText(AnnotationSpan
-                    .linkify(mContext.getText(R.string.battery_missing_help_message), linkInfo));
-        } else {
-            mSummary1.setText(mContext.getText(R.string.battery_missing_message));
-        }
+        mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
+        mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
     }
 
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
diff --git a/src/com/android/settings/fuelgauge/OWNERS b/src/com/android/settings/fuelgauge/OWNERS
index ab3da89..d68dc98 100644
--- a/src/com/android/settings/fuelgauge/OWNERS
+++ b/src/com/android/settings/fuelgauge/OWNERS
@@ -2,3 +2,6 @@
 tifn@google.com
 wesleycwwang@google.com
 ykhung@google.com
+
+# BatteryStats
+per-file FakeUid.java = file:platform/frameworks/base:/BATTERY_STATS_OWNERS
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 735f43d..c00c131 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -25,14 +25,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings.Global;
-import android.text.format.Formatter;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.Loader;
 
 import com.android.settings.R;
@@ -44,7 +39,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.utils.PowerUtil;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.List;
@@ -54,18 +48,15 @@
  * since the last time it was unplugged.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class PowerUsageSummary extends PowerUsageBase implements OnLongClickListener,
+public class PowerUsageSummary extends PowerUsageBase implements
         BatteryTipPreferenceController.BatteryTipListener {
 
     static final String TAG = "PowerUsageSummary";
 
-    private static final String KEY_BATTERY_HEADER = "battery_header";
-
     @VisibleForTesting
     static final int BATTERY_INFO_LOADER = 1;
     @VisibleForTesting
     static final int BATTERY_TIP_LOADER = 2;
-    public static final int DEBUG_INFO_LOADER = 3;
 
     @VisibleForTesting
     PowerUsageFeatureProvider mPowerFeatureProvider;
@@ -112,49 +103,6 @@
                 }
             };
 
-    LoaderManager.LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =
-            new LoaderCallbacks<List<BatteryInfo>>() {
-                @Override
-                public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
-                    return new DebugEstimatesLoader(getContext(), mStatsHelper);
-                }
-
-                @Override
-                public void onLoadFinished(Loader<List<BatteryInfo>> loader,
-                        List<BatteryInfo> batteryInfos) {
-                    updateViews(batteryInfos);
-                }
-
-                @Override
-                public void onLoaderReset(Loader<List<BatteryInfo>> loader) {
-                }
-            };
-
-    protected void updateViews(List<BatteryInfo> batteryInfos) {
-        final BatteryMeterView batteryView = mBatteryLayoutPref
-                .findViewById(R.id.battery_header_icon);
-        final TextView percentRemaining =
-                mBatteryLayoutPref.findViewById(R.id.battery_percent);
-        final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
-        BatteryInfo oldInfo = batteryInfos.get(0);
-        BatteryInfo newInfo = batteryInfos.get(1);
-        percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
-
-        // set the text to the old estimate (copied from battery info). Note that this
-        // can sometimes say 0 time remaining because battery stats requires the phone
-        // be unplugged for a period of time before being willing ot make an estimate.
-        final String OldEstimateString = mPowerFeatureProvider.getOldEstimateDebugString(
-                Formatter.formatShortElapsedTime(getContext(),
-                        PowerUtil.convertUsToMs(oldInfo.remainingTimeUs)));
-        final String NewEstimateString = mPowerFeatureProvider.getEnhancedEstimateDebugString(
-                Formatter.formatShortElapsedTime(getContext(),
-                        PowerUtil.convertUsToMs(newInfo.remainingTimeUs)));
-        summary1.setText(OldEstimateString + "\n" + NewEstimateString);
-
-        batteryView.setBatteryLevel(oldInfo.batteryLevel);
-        batteryView.setCharging(!oldInfo.discharging);
-    }
-
     private LoaderManager.LoaderCallbacks<List<BatteryTip>> mBatteryTipsCallbacks =
             new LoaderManager.LoaderCallbacks<List<BatteryTip>>() {
 
@@ -197,7 +145,6 @@
         setAnimationAllowed(true);
 
         initFeatureProvider();
-        mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
 
         mBatteryUtils = BatteryUtils.getInstance(getContext());
 
@@ -275,17 +222,6 @@
     }
 
     @VisibleForTesting
-    void showBothEstimates() {
-        final Context context = getContext();
-        if (context == null
-                || !mPowerFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
-            return;
-        }
-        getLoaderManager().restartLoader(DEBUG_INFO_LOADER, Bundle.EMPTY,
-                mBatteryInfoDebugLoaderCallbacks);
-    }
-
-    @VisibleForTesting
     void initFeatureProvider() {
         final Context context = getContext();
         mPowerFeatureProvider = FeatureFactory.getFactory(context)
@@ -303,11 +239,6 @@
         }
         getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,
                 mBatteryInfoLoaderCallbacks);
-        if (mPowerFeatureProvider.isEstimateDebugEnabled()) {
-            // Set long click action for summary to show debug info
-            View header = mBatteryLayoutPref.findViewById(R.id.summary1);
-            header.setOnLongClickListener(this);
-        }
     }
 
     @VisibleForTesting
@@ -316,13 +247,6 @@
     }
 
     @Override
-    public boolean onLongClick(View view) {
-        showBothEstimates();
-        view.setOnLongClickListener(null);
-        return true;
-    }
-
-    @Override
     protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
         super.restartBatteryStatsLoader(refreshType);
         // Update battery header if battery is present.
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 257810c..122e13a 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -88,8 +88,8 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
-        mPreference.setTitle(mContext.getString(R.string.battery_saver_main_switch_title));
+        mPreference = screen.findPreference(getPreferenceKey());
+        mPreference.setTitle(mContext.getString(R.string.battery_saver_master_switch_title));
         mPreference.addOnSwitchChangeListener(this);
         mPreference.updateStatus(isChecked());
     }
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index ddcdd59..14fe6a6 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -31,6 +31,7 @@
 import android.os.ServiceManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.VisibleForTesting;
@@ -38,6 +39,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsTutorialDialogWrapperActivity;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -77,8 +79,11 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        SearchMenuController.init(this /* host */);
-        HelpMenuController.init(this /* host */);
+        // TODO(b/176883483): Remove both search and help menu if this feature rolled out
+        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            SearchMenuController.init(this /* host */);
+            HelpMenuController.init(this /* host */);
+        }
 
         SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
                 .getSuggestionFeatureProvider(context);
diff --git a/src/com/android/settings/location/LocationPersonalSettings.java b/src/com/android/settings/location/LocationPersonalSettings.java
index 92796a4..38b7c4a 100644
--- a/src/com/android/settings/location/LocationPersonalSettings.java
+++ b/src/com/android/settings/location/LocationPersonalSettings.java
@@ -50,12 +50,13 @@
         super.onAttach(context);
 
         use(AppLocationPermissionPreferenceController.class).init(this);
-        use(LocationServicePreferenceController.class).init(this);
+        // STOPSHIP(b/180533061): resolve the personal/work location services issue before we can
+        // ship.
         use(LocationFooterPreferenceController.class).init(this);
 
         final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
-        final RecentLocationRequestPreferenceController controller = use(
-                RecentLocationRequestPreferenceController.class);
+        final RecentLocationAccessPreferenceController controller = use(
+                RecentLocationAccessPreferenceController.class);
         controller.init(this);
         controller.setProfileType(profileType);
     }
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/LocationServices.java
similarity index 79%
rename from src/com/android/settings/location/ScanningSettings.java
rename to src/com/android/settings/location/LocationServices.java
index 90f4e2a..8f05584 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/LocationServices.java
@@ -29,20 +29,21 @@
 import java.util.List;
 
 /**
- * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
+ * A page that configures the Location Services settings including Wi-Fi scanning, Bluetooth
+ * scanning, and injected location services.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ScanningSettings extends DashboardFragment {
-    private static final String TAG = "ScanningSettings";
+public class LocationServices extends DashboardFragment {
+    private static final String TAG = "LocationServicesSettings";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_SCANNING;
+        return SettingsEnums.LOCATION_SERVICES;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_scanning;
+        return R.xml.location_services;
     }
 
     @Override
@@ -55,6 +56,13 @@
         return buildPreferenceControllers(context);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        use(LocationServicePreferenceController.class).init(this);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new WifiScanningPreferenceController(context));
@@ -66,7 +74,7 @@
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_scanning) {
+            new BaseSearchIndexProvider(R.xml.location_services) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index b4f0f1f..9a61b31 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -82,8 +82,7 @@
         super.onAttach(context);
 
         use(AppLocationPermissionPreferenceController.class).init(this);
-        use(RecentLocationRequestPreferenceController.class).init(this);
-        use(LocationServicePreferenceController.class).init(this);
+        use(RecentLocationAccessPreferenceController.class).init(this);
         use(LocationFooterPreferenceController.class).init(this);
         use(LocationForWorkPreferenceController.class).init(this);
         use(LocationServiceForWorkPreferenceController.class).init(this);
diff --git a/src/com/android/settings/location/LocationWorkProfileSettings.java b/src/com/android/settings/location/LocationWorkProfileSettings.java
index 2bf5f98..601ec23 100644
--- a/src/com/android/settings/location/LocationWorkProfileSettings.java
+++ b/src/com/android/settings/location/LocationWorkProfileSettings.java
@@ -55,8 +55,8 @@
         use(LocationForWorkPreferenceController.class).init(this);
 
         final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
-        final RecentLocationRequestPreferenceController controller = use(
-                RecentLocationRequestPreferenceController.class);
+        final RecentLocationAccessPreferenceController controller = use(
+                RecentLocationAccessPreferenceController.class);
         controller.init(this);
         controller.setProfileType(profileType);
     }
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index c835a51..245118d 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -13,114 +13,141 @@
  */
 package com.android.settings.location;
 
-import static java.util.concurrent.TimeUnit.DAYS;
+import static android.Manifest.permission_group.LOCATION;
 
-import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
-import android.icu.text.RelativeDateTimeFormatter;
-import android.provider.DeviceConfig;
-import android.view.View;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settingslib.location.RecentLocationAccesses;
-import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.AppEntitiesHeaderController;
-import com.android.settingslib.widget.AppEntityInfo;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.AppPreference;
 
+import java.util.ArrayList;
 import java.util.List;
 
-public class RecentLocationAccessPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-    /** Key for the recent location apps dashboard */
-    private static final String KEY_APPS_DASHBOARD = "apps_dashboard";
-    private final RecentLocationAccesses mRecentLocationAccesses;
-    private AppEntitiesHeaderController mController;
-    private static final int MAXIMUM_APP_COUNT = 3;
+/**
+ * Preference controller that handles the display of apps that access locations.
+ */
+public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController {
+    @VisibleForTesting
+    RecentLocationAccesses mRecentLocationApps;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+    private int mType = ProfileSelectFragment.ProfileType.ALL;
 
-    public RecentLocationAccessPreferenceController(Context context) {
-        this(context, new RecentLocationAccesses(context));
+    private static class PackageEntryClickedListener implements
+            Preference.OnPreferenceClickListener {
+        private final Context mContext;
+        private final String mPackage;
+        private final UserHandle mUserHandle;
+
+        PackageEntryClickedListener(Context context, String packageName,
+                UserHandle userHandle) {
+            mContext = context;
+            mPackage = packageName;
+            mUserHandle = userHandle;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
+            intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, LOCATION);
+            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackage);
+            intent.putExtra(Intent.EXTRA_USER, mUserHandle);
+            mContext.startActivity(intent);
+            return true;
+        }
+    }
+
+    public RecentLocationAccessPreferenceController(Context context, String key) {
+        this(context, key, new RecentLocationAccesses(context));
     }
 
     @VisibleForTesting
-    RecentLocationAccessPreferenceController(Context context,
-            RecentLocationAccesses recentAccesses) {
-        super(context);
-        mRecentLocationAccesses = recentAccesses;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_APPS_DASHBOARD;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return Boolean.parseBoolean(
-                DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
-                        Utils.PROPERTY_PERMISSIONS_HUB_ENABLED));
+    public RecentLocationAccessPreferenceController(Context context, String key,
+            RecentLocationAccesses recentLocationApps) {
+        super(context, key);
+        mRecentLocationApps = recentLocationApps;
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        final LayoutPreference preference = screen.findPreference(KEY_APPS_DASHBOARD);
-        final View view = preference.findViewById(R.id.app_entities_header);
-        mController = AppEntitiesHeaderController.newInstance(mContext, view)
-                .setHeaderTitleRes(R.string.location_category_recent_location_access)
-                .setHeaderDetailsRes(R.string.location_recent_location_access_view_details)
-                .setHeaderEmptyRes(R.string.location_no_recent_accesses)
-                .setHeaderDetailsClickListener((View v) -> {
-                    final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
-                    intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
-                            Manifest.permission.ACCESS_FINE_LOCATION);
-                    intent.putExtra(Intent.EXTRA_DURATION_MILLIS, DAYS.toMillis(1));
-                    mContext.startActivity(intent);
-                });
+        mCategoryRecentLocationRequests = screen.findPreference(getPreferenceKey());
+        final Context prefContext = mCategoryRecentLocationRequests.getContext();
+        final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();
+        final UserManager userManager = UserManager.get(mContext);
+        for (RecentLocationAccesses.Access access : mRecentLocationApps.getAppListSorted()) {
+            if (isRequestMatchesProfileType(userManager, access, mType)) {
+                recentLocationAccesses.add(access);
+            }
+        }
+
+        if (recentLocationAccesses.size() > 0) {
+            // Add preferences to container in original order (already sorted by recency).
+            for (RecentLocationAccesses.Access access : recentLocationAccesses) {
+                mCategoryRecentLocationRequests.addPreference(
+                        createAppPreference(prefContext, access, mFragment));
+            }
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = new AppPreference(prefContext);
+            banner.setTitle(R.string.location_no_recent_accesses);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
     }
 
     @Override
-    public void updateState(Preference preference) {
-        updateRecentApps();
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mCategoryRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
     }
 
-    private void updateRecentApps() {
-        final List<RecentLocationAccesses.Access> recentLocationAccesses =
-                mRecentLocationAccesses.getAppListSorted();
-        if (recentLocationAccesses.size() > 0) {
-            // Display the top 3 preferences to container in original order.
-            int i = 0;
-            for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
-                final RecentLocationAccesses.Access access = recentLocationAccesses.get(i);
-                final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
-                        .setIcon(access.icon)
-                        .setTitle(access.label)
-                        .setSummary(StringUtil.formatRelativeTime(mContext,
-                                System.currentTimeMillis() - access.accessFinishTime, false,
-                                RelativeDateTimeFormatter.Style.SHORT))
-                        .setOnClickListener((v) -> {
-                            final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
-                            intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
-                                    Manifest.permission.ACCESS_FINE_LOCATION);
-                            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, access.packageName);
-                            intent.putExtra(Intent.EXTRA_USER, access.userHandle);
-                            mContext.startActivity(intent);
-                        })
-                        .build();
-                mController.setAppEntity(i, appEntityInfo);
-            }
-            for (; i < MAXIMUM_APP_COUNT; i++) {
-                mController.removeAppEntity(i);
-            }
+    /**
+     * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
+     *
+     * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
+     */
+    public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
+        mType = type;
+    }
+
+    /**
+     * Create a {@link AppPreference}
+     */
+    public static AppPreference createAppPreference(Context prefContext,
+            RecentLocationAccesses.Access access, DashboardFragment fragment) {
+        final AppPreference pref = new AppPreference(prefContext);
+        pref.setIcon(access.icon);
+        pref.setTitle(access.label);
+        pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
+                fragment.getContext(), access.packageName, access.userHandle));
+        return pref;
+    }
+
+    /**
+     * Return if the {@link RecentLocationAccesses.Access} matches current UI
+     * {@ProfileSelectFragment.ProfileType}
+     */
+    public static boolean isRequestMatchesProfileType(UserManager userManager,
+            RecentLocationAccesses.Access access, @ProfileSelectFragment.ProfileType int type) {
+
+        final boolean isWorkProfile = userManager.isManagedProfile(
+                access.userHandle.getIdentifier());
+        if (isWorkProfile && (type & ProfileSelectFragment.ProfileType.WORK) != 0) {
+            return true;
         }
-        mController.apply();
+        if (!isWorkProfile && (type & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
+            return true;
+        }
+        return false;
     }
 }
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
index e072b5c..e1e56a8 100644
--- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
+import android.net.wifi.WifiManager;
 import android.provider.Settings;
 
 import androidx.preference.PreferenceScreen;
@@ -28,8 +29,11 @@
  */
 public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {
 
+    private final WifiManager mWifiManager;
+
     public AdaptiveConnectivityTogglePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mWifiManager = context.getSystemService(WifiManager.class);
     }
 
     @Override
@@ -53,6 +57,7 @@
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
                 isChecked ? 1 : 0);
+        mWifiManager.setWifiScoringEnabled(isChecked);
         return true;
     }
 }
diff --git a/src/com/android/settings/network/BluetoothTetherPreferenceController.java b/src/com/android/settings/network/BluetoothTetherPreferenceController.java
index ab507da..96d39e3 100644
--- a/src/com/android/settings/network/BluetoothTetherPreferenceController.java
+++ b/src/com/android/settings/network/BluetoothTetherPreferenceController.java
@@ -70,7 +70,7 @@
 
     @Override
     public boolean shouldShow() {
-        final String[] bluetoothRegexs = mCm.getTetherableBluetoothRegexs();
+        final String[] bluetoothRegexs = mTm.getTetherableBluetoothRegexs();
         return bluetoothRegexs != null && bluetoothRegexs.length != 0;
     }
 
diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java
index 19c410d..06cd6a7 100644
--- a/src/com/android/settings/network/EthernetTetherPreferenceController.java
+++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java
@@ -65,7 +65,7 @@
 
     @Override
     public boolean shouldEnable() {
-        String[] available = mCm.getTetherableIfaces();
+        String[] available = mTm.getTetherableIfaces();
         for (String s : available) {
             if (s.matches(mEthernetRegex)) {
                 return true;
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
index a811978..fcb8345 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
@@ -27,7 +27,6 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.telephony.CallsDefaultSubscriptionController;
 import com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController;
-import com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController;
 import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;
 import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -46,8 +45,6 @@
     @VisibleForTesting
     static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING =
             "provider_model_backup_calling_category";
-    static final String KEY_PREFERENCE_CATEGORY_WFC_FOOTER =
-            "provider_model_calls_sms_footer";
 
     @VisibleForTesting
     static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";
@@ -74,12 +71,6 @@
         backupCallingPrefCtrl.init(getSettingsLifecycle());
         controllers.add(backupCallingPrefCtrl);
 
-        NetworkProviderWfcFooterPreferenceController wfcFooterPreferenceController =
-                new NetworkProviderWfcFooterPreferenceController(context,
-                        KEY_PREFERENCE_CATEGORY_WFC_FOOTER);
-        wfcFooterPreferenceController.init(getSettingsLifecycle());
-        controllers.add(wfcFooterPreferenceController);
-
         return controllers;
     }
 
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
index 4f17e3f..8b16bc9 100644
--- a/src/com/android/settings/network/OWNERS
+++ b/src/com/android/settings/network/OWNERS
@@ -6,6 +6,7 @@
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
+wengsu@google.com
 zoeychen@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index c7a7ad4..8ae4197 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -29,6 +29,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -141,7 +142,7 @@
                 .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
                 .addEndItem(toggleAction)
                 .setPrimaryAction(primaryAction)
-                .setSubtitle(summary);
+                .setSubtitle(Html.fromHtml(summary, Html.FROM_HTML_MODE_LEGACY));
         return rowBuilder;
     }
 
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index d028c58..392ccc6 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -35,6 +35,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 import android.util.ArraySet;
 
 import androidx.annotation.VisibleForTesting;
@@ -255,14 +256,17 @@
         mUpdateListener.onChildrenUpdated();
     }
 
-    private String getMobilePreferenceSummary(int subId) {
+    private CharSequence getMobilePreferenceSummary(int subId) {
         String result = mSubsPrefCtrlInjector.getNetworkType(
                 mContext, mConfig, mTelephonyDisplayInfo, subId);
+        if (!mTelephonyManager.isDataEnabled()) {
+            return mContext.getString(R.string.mobile_data_off_summary);
+        }
         if (!result.isEmpty() && mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext)) {
             result = mContext.getString(R.string.preference_summary_default_combination,
                     mContext.getString(R.string.mobile_data_connection_active), result);
         }
-        return result;
+        return Html.fromHtml(result, Html.FROM_HTML_MODE_LEGACY);
     }
 
     private Drawable getIcon(int subId) {
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 1919770..822aa72 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -33,7 +33,7 @@
         TetherEnabler.OnTetherStateUpdateListener {
 
     private static final String TAG = "TetherBasePreferenceController";
-    final ConnectivityManager mCm;
+    final TetheringManager mTm;
     private final DataSaverBackend mDataSaverBackend;
 
     private TetherEnabler mTetherEnabler;
@@ -43,7 +43,7 @@
 
     TetherBasePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTm = context.getSystemService(TetheringManager.class);
         mDataSaverBackend = new DataSaverBackend(context);
         mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
     }
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index 6ab4cb2..ef031f6 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -147,7 +147,7 @@
         mSwitchWidgetController.setListener(this);
         mSwitchWidgetController.startListening();
         final IntentFilter filter = new IntentFilter(
-                ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+                TetheringManager.ACTION_TETHER_STATE_CHANGED);
         filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
         filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         mContext.registerReceiver(mTetherChangeReceiver, filter);
@@ -222,7 +222,7 @@
     int getTetheringState(@Nullable String[] tethered) {
         int tetherState = TETHERING_OFF;
         if (tethered == null) {
-            tethered = mConnectivityManager.getTetheredIfaces();
+            tethered = mTetheringManager.getTetheredIfaces();
         }
 
         if (mWifiManager.isWifiApEnabled()) {
@@ -239,7 +239,7 @@
             }
         }
 
-        String[] usbRegexs = mConnectivityManager.getTetherableUsbRegexs();
+        String[] usbRegexs = mTetheringManager.getTetherableUsbRegexs();
         for (String s : tethered) {
             for (String regex : usbRegexs) {
                 if (s.matches(regex)) {
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 2409544..8df0ac1 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -28,6 +28,7 @@
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -62,6 +63,7 @@
     private final AtomicReference<BluetoothPan> mBluetoothPan;
     private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
+    private final TetheringManager mTetheringManager;
     @VisibleForTesting
     final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
@@ -86,6 +88,7 @@
         mBluetoothPan = new AtomicReference<>();
         mConnectivityManager = null;
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mTetheringManager = null;
     }
 
     public TetherPreferenceController(Context context, Lifecycle lifecycle) {
@@ -95,6 +98,7 @@
         mConnectivityManager =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -144,7 +148,7 @@
             mTetherReceiver = new TetherBroadcastReceiver();
         }
         mContext.registerReceiver(
-                mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+                mTetherReceiver, new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED));
         mContext.getContentResolver()
                 .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
     }
@@ -178,9 +182,9 @@
             // Preference is not ready yet.
             return;
         }
-        String[] allTethered = mConnectivityManager.getTetheredIfaces();
-        String[] wifiTetherRegex = mConnectivityManager.getTetherableWifiRegexs();
-        String[] bluetoothRegex = mConnectivityManager.getTetherableBluetoothRegexs();
+        String[] allTethered = mTetheringManager.getTetheredIfaces();
+        String[] wifiTetherRegex = mTetheringManager.getTetherableWifiRegexs();
+        String[] bluetoothRegex = mTetheringManager.getTetherableBluetoothRegexs();
 
         boolean hotSpotOn = false;
         boolean tetherOn = false;
@@ -211,7 +215,7 @@
                 && bluetoothRegex != null && bluetoothRegex.length > 0
                 && mBluetoothAdapter != null
                 && mBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
-            // Check bluetooth state. It's not included in mConnectivityManager.getTetheredIfaces.
+            // Check bluetooth state. It's not included in mTetheringManager.getTetheredIfaces.
             final BluetoothPan pan = mBluetoothPan.get();
             tetherOn = pan != null && pan.isTetheringOn();
         }
diff --git a/src/com/android/settings/network/UsbTetherPreferenceController.java b/src/com/android/settings/network/UsbTetherPreferenceController.java
index 7cf1ddf..7a5cc21 100644
--- a/src/com/android/settings/network/UsbTetherPreferenceController.java
+++ b/src/com/android/settings/network/UsbTetherPreferenceController.java
@@ -68,7 +68,7 @@
 
     @Override
     public boolean shouldShow() {
-        String[] usbRegexs = mCm.getTetherableUsbRegexs();
+        String[] usbRegexs = mTm.getTetherableUsbRegexs();
         return  usbRegexs != null && usbRegexs.length != 0 && !Utils.isMonkeyRunning();
     }
 
diff --git a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
index 38e831b..783f78f 100644
--- a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
+++ b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
@@ -68,7 +68,7 @@
 
     @Override
     public boolean shouldShow() {
-        final String[] wifiRegexs = mCm.getTetherableWifiRegexs();
+        final String[] wifiRegexs = mTm.getTetherableWifiRegexs();
         return wifiRegexs != null && wifiRegexs.length != 0 && !Utils.isMonkeyRunning()
                 && getTetheringStateOfOtherInterfaces() != TetherEnabler.TETHERING_OFF;
     }
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index f5bb1be..02d9b3d 100755
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -43,6 +43,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.data.ApnSetting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -344,7 +345,8 @@
                     pref.setSummary(apn);
                 }
 
-                final boolean selectable = ((type == null) || !type.equals("mms"));
+                final boolean selectable =
+                        ((type == null) || type.contains(ApnSetting.TYPE_DEFAULT_STRING));
                 pref.setSelectable(selectable);
                 if (selectable) {
                     if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 1fa4300..c780234 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -31,7 +31,8 @@
     private static final long BITMASK_2G =  TelephonyManager.NETWORK_TYPE_BITMASK_GSM
                 | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS
                 | TelephonyManager.NETWORK_TYPE_BITMASK_EDGE
-                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
 
     private CarrierConfigManager mCarrierConfigManager;
     private TelephonyManager mTelephonyManager;
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 9e7a3a8..5680bf6 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -35,6 +35,7 @@
 
 import com.android.settings.R;
 import com.android.settings.network.AllowedNetworkTypesListener;
+import com.android.settings.network.SubscriptionsChangeListener;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import java.util.ArrayList;
@@ -47,7 +48,8 @@
  */
 public class EnabledNetworkModePreferenceController extends
         TelephonyBasePreferenceController implements
-        ListPreference.OnPreferenceChangeListener, LifecycleObserver {
+        ListPreference.OnPreferenceChangeListener, LifecycleObserver,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
 
     private static final String LOG_TAG = "EnabledNetworkMode";
     private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
@@ -56,9 +58,11 @@
     private TelephonyManager mTelephonyManager;
     private CarrierConfigManager mCarrierConfigManager;
     private PreferenceEntriesBuilder mBuilder;
+    private SubscriptionsChangeListener mSubscriptionsListener;
 
     public EnabledNetworkModePreferenceController(Context context, String key) {
         super(context, key);
+        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
     }
 
     @Override
@@ -85,6 +89,7 @@
 
     @OnLifecycleEvent(ON_START)
     public void onStart() {
+        mSubscriptionsListener.start();
         if (mAllowedNetworkTypesListener == null) {
             return;
         }
@@ -93,6 +98,7 @@
 
     @OnLifecycleEvent(ON_STOP)
     public void onStop() {
+        mSubscriptionsListener.stop();
         if (mAllowedNetworkTypesListener == null) {
             return;
         }
@@ -196,11 +202,14 @@
         PreferenceEntriesBuilder(Context context, int subId) {
             this.mContext = context;
             this.mSubId = subId;
-
             mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
             mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
                     .createForSubscriptionId(mSubId);
+            updateConfig();
+        }
 
+        public void updateConfig() {
+            mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
             final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
             mAllowed5gNetworkType = checkSupportedRadioBitmask(
                     mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -214,6 +223,11 @@
                     && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
             mShow4gForLTE = carrierConfig != null && carrierConfig.getBoolean(
                     CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
+            Log.d(LOG_TAG, "PreferenceEntriesBuilder: subId" + mSubId
+                    + ",Supported5gRadioAccessFamily :" + mSupported5gRadioAccessFamily
+                    + ",mAllowed5gNetworkType :" + mAllowed5gNetworkType
+                    + ",IsGlobalCdma :" + mIsGlobalCdma
+                    + ",Show4gForLTE :" + mShow4gForLTE);
         }
 
         void setPreferenceEntries() {
@@ -818,4 +832,13 @@
         }
 
     }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        mBuilder.updateConfig();
+    }
 }
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
deleted file mode 100644
index 166094d..0000000
--- a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.android.settings.network.telephony;
-
-import android.content.Context;
-import android.content.Intent;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.utils.AnnotationSpan;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-
-import java.util.List;
-
-public class NetworkProviderWfcFooterPreferenceController extends BasePreferenceController
-        implements LifecycleObserver {
-
-    /**
-     * Constructor.
-     */
-    public NetworkProviderWfcFooterPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    /**
-     * Initialize the binding with Lifecycle
-     *
-     * @param lifecycle Lifecycle of UI which owns this Preference
-     */
-    public void init(Lifecycle lifecycle) {
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-
-        if (preference != null) {
-            // This is necessary to ensure that setting the title to the spannable string returned
-            // by getFooterText will be accepted.  Internally, setTitle does an equality check on
-            // the spannable string being set to the text already set on the preference.  That
-            // equality check apparently only takes into account the raw text and not and spannables
-            // that are part of the text.  So we clear the title before applying the spannable
-            // footer to ensure it is accepted.
-            preference.setTitle("");
-            preference.setTitle(getFooterText());
-        }
-    }
-
-    private CharSequence getFooterText() {
-        final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
-                mContext.getString(R.string.help_uri_wifi_calling),
-                mContext.getClass().getName());
-        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(mContext,
-                "url", helpIntent);
-
-        return AnnotationSpan.linkify(mContext.getText(R.string.calls_sms_footnote), linkInfo);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        final SubscriptionManager subscriptionManager =
-                mContext.getSystemService(SubscriptionManager.class);
-        final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getActiveSubscriptions(
-                subscriptionManager);
-        if (subscriptions.size() >= 1) {
-            return AVAILABLE;
-        } else {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
-    }
-}
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index ff641e9..c8121c4 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -343,16 +343,6 @@
                     mPreferenceCategory.getPreference(numberOfPreferences));
         }
 
-        // update selected preference instance by index
-        for (int index = 0; index < mCellInfoList.size(); index++) {
-            final CellInfo cellInfo = mCellInfoList.get(index);
-
-            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {
-                mSelectedPreference = (NetworkOperatorPreference)
-                        (mPreferenceCategory.getPreference(index));
-            }
-        }
-
         // update the content of preference
         NetworkOperatorPreference connectedPref = null;
         for (int index = 0; index < mCellInfoList.size(); index++) {
@@ -386,6 +376,16 @@
             }
         }
 
+        // update selected preference instance by index
+        for (int index = 0; index < mCellInfoList.size(); index++) {
+            final CellInfo cellInfo = mCellInfoList.get(index);
+
+            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {
+                mSelectedPreference = (NetworkOperatorPreference)
+                        (mPreferenceCategory.getPreference(index));
+            }
+        }
+
         return connectedPref;
     }
 
diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index afb965f..948a361 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -163,8 +163,16 @@
                         return o1.getNotificationChannel().getId().compareTo(
                                 o2.getNotificationChannel().getId());
                     }
-                    return sCollator.compare(o1.getShortcutInfo().getLabel(),
-                            o2.getShortcutInfo().getLabel());
+                    if (o1.getShortcutInfo().getLabel() == null
+                            && o2.getShortcutInfo().getLabel() != null) {
+                        return 1;
+                    }
+                    if (o1.getShortcutInfo().getLabel() != null
+                            && o2.getShortcutInfo().getLabel() == null) {
+                        return -1;
+                    }
+                    return sCollator.compare(o1.getShortcutInfo().getLabel().toString(),
+                            o2.getShortcutInfo().getLabel().toString());
                 }
             };
 }
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index d5745ac..4958f1b 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -21,7 +21,6 @@
 import static androidx.core.view.accessibility.AccessibilityEventCompat.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.INotificationManager;
 import android.content.ComponentName;
@@ -55,6 +54,7 @@
 import com.android.internal.logging.UiEventLoggerImpl;
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.MainSwitchBar;
 import com.android.settingslib.widget.OnMainSwitchChangeListener;
@@ -65,7 +65,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-public class NotificationHistoryActivity extends Activity {
+public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
 
     private static String TAG = "NotifHistory";
 
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index 53a1a59..be42850 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -64,7 +64,6 @@
 
     private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 1;
 
-    private final KeyStore mKeyStore = KeyStore.getInstance();
     private LockPatternUtils mUtils;
 
     /**
diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
index 0700b46..48e7f84 100644
--- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java
+++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.os.UserManager;
-import android.security.KeyStore;
 
 import androidx.preference.PreferenceScreen;
 
@@ -27,6 +26,9 @@
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+
 public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
         implements LifecycleObserver, OnResume {
 
@@ -38,7 +40,13 @@
 
     public ResetCredentialsPreferenceController(Context context, Lifecycle lifecycle) {
         super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mKeyStore = KeyStore.getInstance();
+        KeyStore keyStore = null;
+        try {
+            keyStore = KeyStore.getInstance("AndroidKeyStore");
+            keyStore.load(null);
+        } catch (Exception e) {
+        }
+        mKeyStore = keyStore;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -58,7 +66,15 @@
     @Override
     public void onResume() {
         if (mPreference != null && !mPreference.isDisabledByAdmin()) {
-            mPreference.setEnabled(!mKeyStore.isEmpty());
+            boolean isEnabled = false;
+            try {
+                if (mKeyStore != null) {
+                    isEnabled = mKeyStore.aliases().hasMoreElements();
+                }
+            } catch (KeyStoreException e) {
+                // If access to keystore fails, treat as disabled.
+            }
+            mPreference.setEnabled(isEnabled);
         }
     }
 }
diff --git a/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
index 8aeb074..0a6c398 100644
--- a/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
+++ b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
@@ -74,7 +74,7 @@
     public void onBindViewHolder(UriAuthenticationPolicyAdapter.UriViewHolder holder,
             int position) {
         Uri uri = mUris.get(position);
-        holder.mUriNameView.setText(uri.toString());
+        holder.mUriNameView.setText(Uri.decode(uri.toString()));
     }
 
     @Override
diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS
index e6569f4..68cee36 100644
--- a/src/com/android/settings/sim/OWNERS
+++ b/src/com/android/settings/sim/OWNERS
@@ -1,7 +1,8 @@
 # Default reviewers for this and subdirectories.
+allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
 goldmanj@google.com
-allenwtsu@google.com
+songferngwang@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
new file mode 100644
index 0000000..9c45ef4
--- /dev/null
+++ b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.os.Process;
+import android.security.keystore.AndroidKeyStoreProvider;
+import android.security.keystore.KeyProperties;
+import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
+import android.util.Log;
+
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.UnrecoverableKeyException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+
+/**
+ * This class provides a portable and unified way to load the content of AndroidKeyStore through
+ * public API.
+ * @hide
+ */
+public class AndroidKeystoreAliasLoader {
+    private static final String TAG = "SettingsKeystoreUtils";
+
+    private final Collection<String> mKeyCertAliases;
+    private final Collection<String> mCaCertAliases;
+    /**
+     * This Constructor loads all aliases of asymmetric keys pairs and certificates in the
+     * AndroidKeyStore within the given namespace.
+     * Viable namespaces are {@link KeyProperties#NAMESPACE_WIFI},
+     * {@link KeyProperties#NAMESPACE_APPLICATION}, or null. The latter two are equivalent in
+     * that they will load the keystore content of the app's own namespace. In case of settings,
+     * this is the namespace of the AID_SYSTEM.
+     *
+     * @param namespace {@link KeyProperties#NAMESPACE_WIFI},
+     *                  {@link KeyProperties#NAMESPACE_APPLICATION}, or null
+     * @hide
+     */
+    public AndroidKeystoreAliasLoader(Integer namespace) {
+        mKeyCertAliases = new ArrayList<>();
+        mCaCertAliases = new ArrayList<>();
+        KeyStore keyStore = null;
+        final Enumeration<String> aliases;
+        try {
+            if (namespace != null && namespace != KeyProperties.NAMESPACE_APPLICATION) {
+                if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                    keyStore = KeyStore.getInstance("AndroidKeyStore");
+                    keyStore.load(new AndroidKeyStoreLoadStoreParameter(namespace));
+                } else {
+                    // In the legacy case we pass in the WIFI UID because that is the only
+                    // possible special namespace that existed as of this writing,
+                    // and new namespaces must only be added using the new mechanism.
+                    keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                }
+            } else {
+                keyStore = KeyStore.getInstance("AndroidKeyStore");
+                keyStore.load(null);
+            }
+            aliases = keyStore.aliases();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to open Android Keystore.", e);
+            // Will return empty lists.
+            return;
+        }
+
+        while (aliases.hasMoreElements()) {
+            final String alias = aliases.nextElement();
+            try {
+                final Key key = keyStore.getKey(alias, null);
+                if (key != null) {
+                    if (key instanceof PrivateKey) {
+                        mKeyCertAliases.add(alias);
+                    }
+                } else {
+                    if (keyStore.getCertificate(alias) != null) {
+                        mCaCertAliases.add(alias);
+                    }
+                }
+            } catch (KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException e) {
+                Log.e(TAG, "Failed to load alias: "
+                        + alias + " from Android Keystore. Ignoring.", e);
+            }
+        }
+    }
+
+    /**
+     * Returns the aliases of the key pairs and certificates stored in the Android KeyStore at the
+     * time the constructor was called.
+     * @return Collection of keystore aliases.
+     * @hide
+     */
+    public Collection<String> getKeyCertAliases() {
+        return mKeyCertAliases;
+    }
+
+    /**
+     * Returns the aliases of the trusted certificates stored in the Android KeyStore at the
+     * time the constructor was called.
+     * @return Collection of keystore aliases.
+     * @hide
+     */
+    public Collection<String> getCaCertAliases() {
+        return mCaCertAliases;
+    }
+}
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index e89e793..b3ae609 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -39,10 +39,14 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
 
     private static final String TAG = "HighlightableAdapter";
     @VisibleForTesting
+    static final long DELAY_COLLAPSE_DURATION_MILLIS = 300L;
+    @VisibleForTesting
     static final long DELAY_HIGHLIGHT_DURATION_MILLIS = 600L;
     private static final long HIGHLIGHT_DURATION = 15000L;
     private static final long HIGHLIGHT_FADE_OUT_DURATION = 500L;
@@ -115,7 +119,7 @@
         View v = holder.itemView;
         if (position == mHighlightPosition
                 && (mHighlightKey != null
-                        && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
+                && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
             // This position should be highlighted. If it's highlighted before - skip animation.
             addHighlightBackground(v, !mFadeInAnimated);
         } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) {
@@ -124,15 +128,26 @@
         }
     }
 
-    public void requestHighlight(View root, RecyclerView recyclerView) {
+    /**
+     * A function can highlight a specific setting in recycler view.
+     * note: Before highlighting a setting, screen collapses tool bar with an animation.
+     */
+    public void requestHighlight(View root, RecyclerView recyclerView, AppBarLayout appBarLayout) {
         if (mHighlightRequested || recyclerView == null || TextUtils.isEmpty(mHighlightKey)) {
             return;
         }
+        final int position = getPreferenceAdapterPosition(mHighlightKey);
+        if (position < 0) {
+            return;
+        }
+
+        if (appBarLayout != null) {
+            root.postDelayed(() -> {
+                appBarLayout.setExpanded(false, true);
+            }, DELAY_COLLAPSE_DURATION_MILLIS);
+        }
+
         root.postDelayed(() -> {
-            final int position = getPreferenceAdapterPosition(mHighlightKey);
-            if (position < 0) {
-                return;
-            }
             mHighlightRequested = true;
             recyclerView.smoothScrollToPosition(position);
             mHighlightPosition = position;
diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 2a7aa73..76f9b41 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -44,7 +44,8 @@
     private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
 
     private SettingsMainSwitchBar mMainSwitchBar;
-    private String mTitle;
+    private CharSequence mTitle;
+    private boolean mIsVisible;
 
     private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin;
 
@@ -77,16 +78,22 @@
         holder.setDividerAllowedBelow(false);
 
         mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
+
         mMainSwitchBar.show();
         updateStatus(isChecked());
         registerListenerToSwitchBar();
+
+        if (!mIsVisible) {
+            mMainSwitchBar.hide();
+        }
     }
 
     private void init(Context context, AttributeSet attrs) {
         setLayoutResource(R.layout.preference_widget_main_switch);
+        mIsVisible = true;
 
         if (attrs != null) {
-            TypedArray a = context.obtainStyledAttributes(attrs,
+            final TypedArray a = context.obtainStyledAttributes(attrs,
                     androidx.preference.R.styleable.Preference, 0/*defStyleAttr*/,
                     0/*defStyleRes*/);
             final CharSequence title = TypedArrayUtils.getText(a,
@@ -99,6 +106,14 @@
         }
     }
 
+    @Override
+    public void setChecked(boolean checked) {
+        super.setChecked(checked);
+        if (mMainSwitchBar != null) {
+            mMainSwitchBar.setChecked(checked);
+        }
+    }
+
     /**
      * Return the SettingsMainSwitchBar
      */
@@ -106,11 +121,9 @@
         return mMainSwitchBar;
     }
 
-    /**
-     * Set the preference title text
-     */
-    public void setTitle(String text) {
-        mTitle = text;
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitle = title;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.setTitle(mTitle);
         }
@@ -133,6 +146,7 @@
      * Show the MainSwitchBar
      */
     public void show() {
+        mIsVisible = true;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.show();
         }
@@ -142,6 +156,7 @@
      * Hide the MainSwitchBar
      */
     public void hide() {
+        mIsVisible = false;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.hide();
         }
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index 5e20fd5..d15cd78 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -2,4 +2,5 @@
 andychou@google.com
 arcwang@google.com
 goldmanj@google.com
+songferngwang@google.com
 wengsu@google.com
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 65e45b7..b2eca78 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -18,12 +18,12 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.net.InetAddresses;
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
 import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkUtils;
 import android.net.ProxyInfo;
 import android.net.StaticIpConfiguration;
 import android.net.Uri;
@@ -34,8 +34,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.Editable;
@@ -67,10 +66,12 @@
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.net.module.util.NetUtils;
 import com.android.net.module.util.ProxyUtils;
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
@@ -79,7 +80,7 @@
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -878,7 +879,7 @@
 
     private Inet4Address getIPv4Address(String text) {
         try {
-            return (Inet4Address) NetworkUtils.numericToInetAddress(text);
+            return (Inet4Address) InetAddresses.parseNumericAddress(text);
         } catch (IllegalArgumentException | ClassCastException e) {
             return null;
         }
@@ -914,7 +915,7 @@
         if (TextUtils.isEmpty(gateway)) {
             try {
                 //Extract a default gateway from IP address
-                InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength);
+                InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength);
                 byte[] addr = netPart.getAddress();
                 addr[addr.length - 1] = 1;
                 mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
@@ -1030,15 +1031,17 @@
         if (refreshCertificates) {
             loadSims();
 
+            final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                    getAndroidKeystoreAliasLoader();
             loadCertificates(
                     mEapCaCertSpinner,
-                    Credentials.CA_CERTIFICATE,
+                    androidKeystoreAliasLoader.getCaCertAliases(),
                     null /* noCertificateString */,
                     false /* showMultipleCerts */,
                     true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
-                    Credentials.USER_PRIVATE_KEY,
+                    androidKeystoreAliasLoader.getKeyCertAliases(),
                     mDoNotProvideEapUserCertString,
                     false /* showMultipleCerts */,
                     false /* showUsePreinstalledCertOption */);
@@ -1121,10 +1124,13 @@
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
+                    final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                            getAndroidKeystoreAliasLoader();
+
                     // Reload the cert spinner with an extra "multiple certificates added" item.
                     loadCertificates(
                             mEapCaCertSpinner,
-                            Credentials.CA_CERTIFICATE,
+                            androidKeystoreAliasLoader.getCaCertAliases(),
                             null /* noCertificateString */,
                             true /* showMultipleCerts */,
                             true /* showUsePreinstalledCertOption */);
@@ -1443,8 +1449,8 @@
     }
 
     @VisibleForTesting
-    KeyStore getKeyStore() {
-        return KeyStore.getInstance();
+    AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+        return new AndroidKeystoreAliasLoader(KeyProperties.NAMESPACE_WIFI);
     }
 
     @VisibleForTesting
@@ -1488,7 +1494,7 @@
     @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
-            String prefix,
+            Collection<String> choices,
             String noCertificateString,
             boolean showMultipleCerts,
             boolean showUsePreinstalledCertOption) {
@@ -1503,14 +1509,8 @@
             certs.add(mUseSystemCertsString);
         }
 
-        String[] certificateNames = null;
-        try {
-            certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
-        } catch (Exception e) {
-            Log.e(TAG, "can't get the certificate list from KeyStore");
-        }
-        if (certificateNames != null && certificateNames.length != 0) {
-            certs.addAll(Arrays.stream(certificateNames)
+        if (choices != null && choices.size() != 0) {
+            certs.addAll(choices.stream()
                     .filter(certificateName -> {
                         for (String undesired : UNDESIRED_CERTIFICATES) {
                             if (certificateName.startsWith(undesired)) {
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 49f1b21..b4e26a6 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -18,11 +18,11 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.net.InetAddresses;
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
-import android.net.NetworkUtils;
 import android.net.ProxyInfo;
 import android.net.StaticIpConfiguration;
 import android.net.Uri;
@@ -32,8 +32,7 @@
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.Editable;
@@ -65,10 +64,12 @@
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.net.module.util.NetUtils;
 import com.android.net.module.util.ProxyUtils;
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
@@ -79,7 +80,7 @@
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -840,7 +841,7 @@
 
     private Inet4Address getIPv4Address(String text) {
         try {
-            return (Inet4Address) NetworkUtils.numericToInetAddress(text);
+            return (Inet4Address) InetAddresses.parseNumericAddress(text);
         } catch (IllegalArgumentException | ClassCastException e) {
             return null;
         }
@@ -876,7 +877,7 @@
         if (TextUtils.isEmpty(gateway)) {
             try {
                 //Extract a default gateway from IP address
-                InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength);
+                InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength);
                 byte[] addr = netPart.getAddress();
                 addr[addr.length - 1] = 1;
                 mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
@@ -993,15 +994,17 @@
         if (refreshCertificates) {
             loadSims();
 
+            final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                    getAndroidKeystoreAliasLoader();
             loadCertificates(
                     mEapCaCertSpinner,
-                    Credentials.CA_CERTIFICATE,
+                    androidKeystoreAliasLoader.getCaCertAliases(),
                     null /* noCertificateString */,
                     false /* showMultipleCerts */,
                     true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
-                    Credentials.USER_PRIVATE_KEY,
+                    androidKeystoreAliasLoader.getKeyCertAliases(),
                     mDoNotProvideEapUserCertString,
                     false /* showMultipleCerts */,
                     false /* showUsePreinstalledCertOption */);
@@ -1086,9 +1089,11 @@
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
                     // Reload the cert spinner with an extra "multiple certificates added" item.
+                    final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                            getAndroidKeystoreAliasLoader();
                     loadCertificates(
                             mEapCaCertSpinner,
-                            Credentials.CA_CERTIFICATE,
+                            androidKeystoreAliasLoader.getCaCertAliases(),
                             null /* noCertificateString */,
                             true /* showMultipleCerts */,
                             true /* showUsePreinstalledCertOption */);
@@ -1407,8 +1412,8 @@
     }
 
     @VisibleForTesting
-    KeyStore getKeyStore() {
-        return KeyStore.getInstance();
+    AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+        return new AndroidKeystoreAliasLoader(KeyProperties.NAMESPACE_WIFI);
     }
 
     @VisibleForTesting
@@ -1452,7 +1457,7 @@
     @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
-            String prefix,
+            Collection<String> choices,
             String noCertificateString,
             boolean showMultipleCerts,
             boolean showUsePreinstalledCertOption) {
@@ -1467,14 +1472,8 @@
             certs.add(mUseSystemCertsString);
         }
 
-        String[] certificateNames = null;
-        try {
-            certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
-        } catch (Exception e) {
-            Log.e(TAG, "can't get the certificate list from KeyStore");
-        }
-        if (certificateNames != null && certificateNames.length != 0) {
-            certs.addAll(Arrays.stream(certificateNames)
+        if (choices != null && choices.size() != 0) {
+            certs.addAll(choices.stream()
                     .filter(certificateName -> {
                         for (String undesired : UNDESIRED_CERTIFICATES) {
                             if (certificateName.startsWith(undesired)) {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 34067e9..5545de6 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -63,7 +63,7 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.location.ScanningSettings;
+import com.android.settings.location.LocationServices;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.MainSwitchBarController;
@@ -921,8 +921,8 @@
                 : getText(R.string.wifi_scan_notify_text_scanning_off);
         final LinkifyUtils.OnClickListener clickListener =
                 () -> new SubSettingLauncher(getContext())
-                        .setDestination(ScanningSettings.class.getName())
-                        .setTitleRes(R.string.location_scanning_screen_title)
+                        .setDestination(LocationServices.class.getName())
+                        .setTitleRes(R.string.location_services_screen_title)
                         .setSourceMetricsCategory(getMetricsCategory())
                         .launch();
         mStatusMessagePreference.setText(title, description, clickListener);
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 735fecc..024c1c3 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -55,14 +55,15 @@
 import com.android.settings.Utils;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
-import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 /**
  * This is the inner class of {@link WifiCallingSettings} fragment.
  * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
  */
 public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener,
+        implements OnMainSwitchChangeListener,
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "WifiCallingForSub";
 
@@ -85,8 +86,7 @@
     public static final int LAUCH_APP_UPDATE = 1;
 
     //UI objects
-    private SwitchBar mSwitchBar;
-    private Switch mSwitch;
+    private SettingsMainSwitchBar mSwitchBar;
     private ListWithEntrySummaryPreference mButtonWfcMode;
     private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
     private Preference mUpdateAddress;
@@ -190,7 +190,6 @@
 
         mSwitchBar = getView().findViewById(R.id.switch_bar);
         mSwitchBar.show();
-        mSwitch = mSwitchBar.getSwitch();
     }
 
     @Override
@@ -296,7 +295,7 @@
         mButtonWfcMode = findPreference(BUTTON_WFC_MODE);
         mButtonWfcMode.setOnPreferenceChangeListener(this);
 
-        mButtonWfcRoamingMode =  findPreference(BUTTON_WFC_ROAMING_MODE);
+        mButtonWfcRoamingMode = findPreference(BUTTON_WFC_ROAMING_MODE);
         mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
 
         mUpdateAddress = findPreference(PREFERENCE_EMERGENCY_ADDRESS);
@@ -403,7 +402,7 @@
         final WifiCallingQueryImsState queryIms = queryImsState(mSubId);
         final boolean wfcEnabled = queryIms.isEnabledByUser()
                 && queryIms.isAllowUserControl();
-        mSwitch.setChecked(wfcEnabled);
+        mSwitchBar.setChecked(wfcEnabled);
         final int wfcMode = mImsMmTelManager.getVoWiFiModeSetting();
         final int wfcRoamingMode = mImsMmTelManager.getVoWiFiRoamingModeSetting();
         mButtonWfcMode.setValue(Integer.toString(wfcMode));
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index c9cddcc..2d9d444 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -40,7 +40,6 @@
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
-import android.net.NetworkUtils;
 import android.net.RouteInfo;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
@@ -64,6 +63,7 @@
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
+import com.android.net.module.util.Inet4AddressUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.FeatureFlags;
@@ -99,7 +99,6 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZonedDateTime;
@@ -873,10 +872,8 @@
 
     private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
         try {
-            InetAddress all = InetAddress.getByAddress(
-                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
-            return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress();
-        } catch (UnknownHostException e) {
+            return Inet4AddressUtils.getPrefixMaskAsInet4Address(prefixLength).getHostAddress();
+        } catch (IllegalArgumentException e) {
             return null;
         }
     }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
index 7ba0216..46da097 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.wifi.tether;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 
 import androidx.preference.Preference;
@@ -36,7 +36,7 @@
 
     protected final WifiManager mWifiManager;
     protected final String[] mWifiRegexs;
-    protected final ConnectivityManager mCm;
+    protected final TetheringManager mTm;
     protected final OnTetherConfigUpdateListener mListener;
 
     protected Preference mPreference;
@@ -46,8 +46,8 @@
         super(context);
         mListener = listener;
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mWifiRegexs = mCm.getTetherableWifiRegexs();
+        mTm = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE);
+        mWifiRegexs = mTm.getTetherableWifiRegexs();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 5049002..70b6a45 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -18,7 +18,7 @@
 
 import android.annotation.NonNull;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiClient;
 import android.net.wifi.WifiManager;
@@ -44,7 +44,7 @@
 
     private static final String WIFI_TETHER_SETTINGS = "wifi_tether";
 
-    private final ConnectivityManager mConnectivityManager;
+    private final TetheringManager mTetheringManager;
     private final String[] mWifiRegexs;
     private final WifiManager mWifiManager;
     private final Lifecycle mLifecycle;
@@ -62,10 +62,9 @@
     WifiTetherPreferenceController(Context context, Lifecycle lifecycle,
             boolean initSoftApManager) {
         super(context);
-        mConnectivityManager =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mWifiRegexs = mConnectivityManager.getTetherableWifiRegexs();
+        mWifiRegexs = mTetheringManager.getTetherableWifiRegexs();
         mLifecycle = lifecycle;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 0529b7a..939f077 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.wifi.tether;
 
-import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
+import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
 
 import android.app.settings.SettingsEnums;
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index 29181af..c897d75 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "AnomalyTester",
 
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 77932ef..44158c7 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -1,6 +1,15 @@
 //############################################################
 // Settings Component test target.                           #
 //############################################################
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsComponentTests",
     certificate: "platform",
diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
index dacd32a..1ec108a 100644
--- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
+++ b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "InstrumentedEntitlementApp",
     srcs: ["src/**/*.java"],
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 1ba5d9c..c03c57f 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsPerfTests",
 
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index f6ad049..337bad7 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -2,6 +2,15 @@
 // Build SettingsRoboTestStub.apk which includes test-only resources.#
 //############################################################
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_app {
     name: "SettingsRoboTestStub",
     defaults: [
@@ -88,3 +97,15 @@
         "SettingsLib-search",
     ],
 }
+
+java_library {
+    name: "Settings-robo-testutils",
+    srcs: ["src/com/android/settings/testutils/**/*.java"],
+
+    libs: [
+        "Settings-core",
+        "Robolectric_all-target",
+        "mockito-robolectric-prebuilt",
+        "truth-prebuilt",
+    ],
+}
diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
index c9a8c44..cd33663 100644
--- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
@@ -33,6 +33,7 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -74,6 +75,8 @@
     @Mock
     private ConnectivityManager mConnectivityManager;
     @Mock
+    private TetheringManager mTetheringManager;
+    @Mock
     private UserManager mUserManager;
     @Mock
     private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
@@ -89,10 +92,12 @@
         MockitoAnnotations.initMocks(this);
         doReturn(mConnectivityManager)
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
-        doReturn(USB_REGEXS).when(mConnectivityManager).getTetherableUsbRegexs();
-        doReturn(BT_REGEXS).when(mConnectivityManager).getTetherableBluetoothRegexs();
-        doReturn(ETHERNET_REGEXS).when(mConnectivityManager).getTetherableIfaces();
+        doReturn(mTetheringManager)
+                .when(mContext).getSystemService(Context.TETHERING_SERVICE);
+        doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
+        doReturn(USB_REGEXS).when(mTetheringManager).getTetherableUsbRegexs();
+        doReturn(BT_REGEXS).when(mTetheringManager).getTetherableBluetoothRegexs();
+        doReturn(ETHERNET_REGEXS).when(mTetheringManager).getTetherableIfaces();
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
         // Assume the feature is enabled for most test cases.
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, true);
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index f217e21..0948cfa 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -34,6 +34,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -66,6 +67,8 @@
     private ConnectivityManager mConnectivityManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private TetheringManager mTetheringManager;
 
     @Before
     public void setUp() {
@@ -76,11 +79,13 @@
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
         doReturn(mUserManager)
                 .when(mContext).getSystemService(Context.USER_SERVICE);
+        doReturn(mTetheringManager)
+                .when(mContext).getSystemService(Context.TETHERING_SERVICE);
 
         setupIsTetherAvailable(true);
 
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
     }
 
     @Test
@@ -110,7 +115,7 @@
 
     @Test
     public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() {
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -123,7 +128,7 @@
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // We can ignore the condition of Utils.isMonkeyRunning()
         // In normal case, monkey and robotest should not execute at the same time
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -133,7 +138,7 @@
 
     @Test
     public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -144,7 +149,7 @@
     @Test
     public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
-        when(mConnectivityManager.getTetherableBluetoothRegexs())
+        when(mTetheringManager.getTetherableBluetoothRegexs())
                 .thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
@@ -235,11 +240,11 @@
     }
 
     private void updateOnlyBluetoothState(TetherSettings tetherSettings) {
-        doReturn(mConnectivityManager).when(tetherSettings)
-            .getSystemService(Context.CONNECTIVITY_SERVICE);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheringErroredIfaces()).thenReturn(new String[0]);
+        doReturn(mTetheringManager).when(tetherSettings)
+            .getSystemService(Context.TETHERING_SERVICE);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheringErroredIfaces()).thenReturn(new String[0]);
         doNothing().when(tetherSettings).updateUsbState(any(String[].class), any(String[].class),
                 any(String[].class));
         doNothing().when(tetherSettings).updateEthernetState(any(String[].class),
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index 3f4175e..8f41884 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -25,10 +25,13 @@
 import android.content.Context;
 import android.content.pm.IPackageManager;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+import com.google.common.truth.Truth;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,6 +63,58 @@
         // should not crash
     }
 
+    @Test
+    public void permissionState_modeDefault_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_DEFAULT;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
+    @Test
+    public void permissionState_modeErrored_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_ERRORED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
+    @Test
+    public void permissionState_modeAllowed_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_ALLOWED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+    }
+
+    @Test
+    public void permissionState_modeIgnored_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_IGNORED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
     private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
         private TestAppStateAppOpsBridge() {
             super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java
new file mode 100644
index 0000000..c3bcead
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class AlarmsAndRemindersDetailsTest {
+
+    @Mock
+    private RestrictedSwitchPreference mSwitchPref;
+    @Mock
+    private PackageInfo mPackageInfo;
+    @Mock
+    private AppStateAlarmsAndRemindersBridge mAppStateBridge;
+    @Mock
+    private AppStateAppOpsBridge.PermissionState mPermissionState;
+
+    private AlarmsAndRemindersDetails mFragment = new AlarmsAndRemindersDetails();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
+        ReflectionHelpers.setField(mFragment, "mAppBridge", mAppStateBridge);
+    }
+
+    @Test
+    public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isFalse();
+        // should not crash
+    }
+
+    @Test
+    public void refreshUi_noApplicationInfo_shouldReturnFalseAndNoCrash() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isFalse();
+        // should not crash
+    }
+
+    @Test
+    public void refreshUi_hasApplicationInfo_shouldReturnTrue() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isTrue();
+    }
+
+    @Test
+    public void refreshUi_switchPreferenceEnabled() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+        mPermissionState.permissionDeclared = false;
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setEnabled(false);
+
+        mPermissionState.permissionDeclared = true;
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setEnabled(true);
+    }
+
+    @Test
+    public void refreshUi_switchPreferenceChecked() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+
+        when(mPermissionState.isPermissible()).thenReturn(true);
+        mFragment.refreshUi();
+        verify(mSwitchPref).setChecked(true);
+
+        when(mPermissionState.isPermissible()).thenReturn(false);
+        mFragment.refreshUi();
+        verify(mSwitchPref).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
deleted file mode 100644
index 0ed68cb..0000000
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
+++ /dev/null
@@ -1,56 +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.applications.specialaccess;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-public class HighPowerAppsControllerTest {
-
-    private Context mContext;
-    private HighPowerAppsController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        mController = new HighPowerAppsController(mContext, "key");
-    }
-
-    @Test
-    public void testHighPowerApps_byDefault_shouldBeShown() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void testHighPowerApps_ifDisabled_shouldNotBeShown() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
index cae7d89..aaeeea4 100644
--- a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
@@ -24,6 +24,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
+import android.view.Display;
 
 import androidx.preference.SwitchPreference;
 
@@ -102,6 +103,21 @@
         assertThat(mController.isChecked()).isFalse();
     }
 
+    @Test
+    public void findPeakRefreshRate_moreThanOneHigherThanDefault() {
+        Display.Mode lower = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE - 1);
+        Display.Mode def = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE);
+        Display.Mode higher = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 1);
+        Display.Mode higher1 = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 2);
+
+        assertThat(mController.findPeakRefreshRate(
+                new Display.Mode[] {lower, def, higher, higher1}))
+                .isEqualTo(DEFAULT_REFRESH_RATE + 2);
+        assertThat(mController.findPeakRefreshRate(
+                new Display.Mode[] {lower, def, higher1, higher}))
+                .isEqualTo(DEFAULT_REFRESH_RATE + 2);
+    }
+
     private void enableSmoothDisplayPreference() {
         mController.mPeakRefreshRate = 88f;
 
diff --git a/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
index 542301c..bf30ebb 100644
--- a/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
@@ -18,24 +18,25 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.emergency.EmergencyGesturePreferenceController.OFF;
-import static com.android.settings.emergency.EmergencyGesturePreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.content.ContentResolver;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
@@ -43,16 +44,18 @@
 @Config(shadows = SettingsShadowResources.class)
 public class EmergencyGesturePreferenceControllerTest {
 
+    @Mock
+    private EmergencyNumberUtils mEmergencyNumberUtils;
     private Context mContext;
-    private ContentResolver mContentResolver;
     private EmergencyGesturePreferenceController mController;
     private static final String PREF_KEY = "gesture_emergency_button";
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         mContext = ApplicationProvider.getApplicationContext();
-        mContentResolver = mContext.getContentResolver();
         mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+        mController.mEmergencyNumberUtils = mEmergencyNumberUtils;
     }
 
     @After
@@ -81,8 +84,7 @@
     @Test
     public void isChecked_configIsNotSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON);
-        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+        when(mEmergencyNumberUtils.getEmergencyGestureEnabled()).thenReturn(true);
 
         assertThat(mController.isChecked()).isTrue();
     }
@@ -90,8 +92,7 @@
     @Test
     public void isChecked_configIsSet_shouldReturnFalse() {
         // Set the setting to be disabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF);
-        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+        when(mEmergencyNumberUtils.getEmergencyGestureEnabled()).thenReturn(false);
 
         assertThat(mController.isChecked()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
index 6f3884e..f8f2ed1 100644
--- a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
@@ -16,40 +16,42 @@
 
 package com.android.settings.emergency;
 
-import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.OFF;
-import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.content.ContentResolver;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class EmergencyGestureSoundPreferenceControllerTest {
-
+    @Mock
+    private EmergencyNumberUtils mEmergencyNumberUtils;
     private Context mContext;
-    private ContentResolver mContentResolver;
     private EmergencyGestureSoundPreferenceController mController;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         mContext = ApplicationProvider.getApplicationContext();
-        mContentResolver = mContext.getContentResolver();
         mController = new EmergencyGestureSoundPreferenceController(mContext, "test_key");
+        mController.mEmergencyNumberUtils = mEmergencyNumberUtils;
     }
 
     @After
@@ -78,8 +80,7 @@
     @Test
     public void isChecked_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
-                ON);
+        when(mEmergencyNumberUtils.getEmergencyGestureSoundEnabled()).thenReturn(true);
 
         assertThat(mController.isChecked()).isTrue();
     }
@@ -87,8 +88,7 @@
     @Test
     public void isChecked_configIsSetToFalse_shouldReturnFalse() {
         // Set the setting to be disabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
-                OFF);
+        when(mEmergencyNumberUtils.getEmergencyGestureSoundEnabled()).thenReturn(false);
 
         assertThat(mController.isChecked()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 11676a2..71eaffc 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -24,12 +24,9 @@
 import android.net.ConnectivityManager;
 import android.net.ProxyInfo;
 
-import androidx.preference.Preference;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -39,7 +36,7 @@
 
     private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Context mContext;
     @Mock
     private ConnectivityManager mCm;
@@ -49,6 +46,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mCm);
         mController = new GlobalHttpProxyPreferenceController(mContext);
     }
 
@@ -62,12 +60,6 @@
     }
 
     @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
     public void testGetPreferenceKey() {
         assertThat(mController.getPreferenceKey()).isEqualTo(KEY_GLOBAL_HTTP_PROXY);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index ac3c8f9..14c943d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -32,9 +32,10 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.icu.text.NumberFormat;
 import android.os.BatteryManager;
 import android.os.PowerManager;
-import android.widget.TextView;
+import android.text.TextUtils;
 
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceFragmentCompat;
@@ -47,7 +48,7 @@
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.UsageProgressBarPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -57,9 +58,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
@@ -67,6 +66,7 @@
 
     private static final String PREF_KEY = "battery_header";
     private static final int BATTERY_LEVEL = 60;
+    private static final int BATTERY_MAX_LEVEL = 100;
     private static final String TIME_LEFT = "2h30min";
     private static final String BATTERY_STATUS = "Charging";
 
@@ -80,13 +80,11 @@
     private BatteryInfo mBatteryInfo;
     @Mock
     private EntityHeaderController mEntityHeaderController;
+    @Mock
+    private UsageProgressBarPreference mBatteryUsageProgressBarPref;
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
     private PowerManager mPowerManager;
-    private BatteryMeterView mBatteryMeterView;
-    private TextView mBatteryPercentText;
-    private TextView mSummary;
-    private LayoutPreference mBatteryLayoutPref;
     private Intent mBatteryIntent;
     private LifecycleOwner mLifecycleOwner;
     private Lifecycle mLifecycle;
@@ -98,9 +96,6 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         mContext = spy(RuntimeEnvironment.application);
-        mBatteryMeterView = new BatteryMeterView(mContext);
-        mBatteryPercentText = new TextView(mContext);
-        mSummary = new TextView(mContext);
         ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
 
         mBatteryIntent = new Intent();
@@ -109,8 +104,7 @@
         mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
         doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
 
-        mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
-        doReturn(mBatteryLayoutPref).when(mPreferenceScreen)
+        doReturn(mBatteryUsageProgressBarPref).when(mPreferenceScreen)
             .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
@@ -122,9 +116,7 @@
         mController.setActivity(mActivity);
         mController.setFragment(mPreferenceFragment);
         mController.setLifecycle(mLifecycle);
-        mController.mBatteryMeterView = mBatteryMeterView;
-        mController.mBatteryPercentText = mBatteryPercentText;
-        mController.mSummary1 = mSummary;
+        mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
     }
 
     @After
@@ -137,11 +129,8 @@
     public void displayPreference_displayBatteryLevel() {
         mController.displayPreference(mPreferenceScreen);
 
-        assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
-                R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(((TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent))
-                .getText().toString())
-                .isEqualTo("60 %");
+        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
@@ -150,7 +139,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        assertThat(mSummary.getText()).isEqualTo(mBatteryInfo.remainingLabel);
+        verify(mBatteryUsageProgressBarPref).setTotalSummary(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -161,8 +150,9 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
+        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPref).setTotalSummary(mBatteryInfo.remainingLabel);
+        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
@@ -172,7 +162,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
+        verify(mBatteryUsageProgressBarPref).setTotalSummary(BATTERY_STATUS);
     }
 
     @Test
@@ -181,7 +171,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        assertThat(mSummary.getText().toString().isEmpty()).isTrue();
+        verify(mBatteryUsageProgressBarPref).setTotalSummary(null);
     }
 
     @Test
@@ -197,27 +187,10 @@
 
     @Test
     public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
-        mSummary.setText(BATTERY_STATUS);
-
         mController.quickUpdateHeaderPreference();
 
-        assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(mBatteryMeterView.getCharging()).isTrue();
-        assertThat(mBatteryPercentText.getText().toString()).isEqualTo("60 %");
-        assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
-    }
-
-    @Test
-    public void quickUpdateHeaderPreference_showPowerSave() {
-        boolean testValues[] = {false, true};
-
-        ShadowPowerManager shadowPowerManager = Shadows.shadowOf(mPowerManager);
-        for (boolean value : testValues) {
-            shadowPowerManager.setIsPowerSaveMode(value);
-            mController.quickUpdateHeaderPreference();
-
-            assertThat(mBatteryMeterView.getPowerSave()).isEqualTo(value);
-        }
+        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
@@ -226,12 +199,8 @@
                 BasePreferenceController.AVAILABLE_UNSEARCHABLE);
     }
 
-    @Test
-    public void displayPreference_batteryNotPresent_shouldShowHelpMessage() {
-        ShadowUtils.setIsBatteryPresent(false);
-
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mController).showHelpMessage();
+    private CharSequence formatBatteryPercentageText() {
+        return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
+                NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index cf278f6..e345ab2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -23,13 +23,11 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 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.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -38,8 +36,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.view.View;
-import android.widget.TextView;
 
 import androidx.loader.app.LoaderManager;
 import androidx.preference.PreferenceScreen;
@@ -53,19 +49,14 @@
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -79,15 +70,12 @@
 public class PowerUsageSummaryTest {
 
     private static final int UID = 123;
-    private static final int UID_2 = 234;
     private static final int POWER_MAH = 100;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
             TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
     private static final long USAGE_TIME_MS = 65 * 60 * 1000;
     private static final double TOTAL_POWER = 200;
-    private static final String NEW_ML_EST_SUFFIX = "(New ML est)";
-    private static final String OLD_EST_SUFFIX = "(Old est)";
     private static Intent sAdditionalBatteryInfoIntent;
 
     @BeforeClass
@@ -101,12 +89,6 @@
     private BatterySipper mScreenBatterySipper;
     @Mock
     private BatterySipper mCellBatterySipper;
-    @Mock
-    private LayoutPreference mBatteryLayoutPref;
-    @Mock
-    private TextView mBatteryPercentText;
-    @Mock
-    private TextView mSummary1;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private BatteryStatsHelper mBatteryHelper;
     @Mock
@@ -114,8 +96,6 @@
     @Mock
     private LoaderManager mLoaderManager;
     @Mock
-    private BatteryInfo mBatteryInfo;
-    @Mock
     private ContentResolver mContentResolver;
     @Mock
     private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
@@ -128,8 +108,6 @@
     private Context mRealContext;
     private TestFragment mFragment;
     private FakeFeatureFactory mFeatureFactory;
-    private BatteryMeterView mBatteryMeterView;
-    private Intent mIntent;
 
     @Before
     public void setUp() {
@@ -139,8 +117,6 @@
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mFragment = spy(new TestFragment(mRealContext));
         mFragment.initFeatureProvider();
-        mBatteryMeterView = new BatteryMeterView(mRealContext);
-        mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
         doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
         doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
 
@@ -158,12 +134,6 @@
         mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
         mCellBatterySipper.totalPowerMah = POWER_MAH;
 
-        when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
-        when(mBatteryLayoutPref.findViewById(R.id.battery_percent)).thenReturn(mBatteryPercentText);
-        when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
-                .thenReturn(mBatteryMeterView);
-        mFragment.setBatteryLayoutPreference(mBatteryLayoutPref);
-
         mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
         mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS;
 
@@ -207,51 +177,6 @@
     }
 
     @Test
-    public void showBothEstimates_summariesAreBothModified() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
-                .thenReturn(true);
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) {
-                return mRealContext.getString(
-                        R.string.power_usage_old_debug, invocation.getArguments()[0]);
-            }
-        }).when(mFeatureFactory.powerUsageFeatureProvider).getOldEstimateDebugString(any());
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) {
-                return mRealContext.getString(
-                        R.string.power_usage_enhanced_debug, invocation.getArguments()[0]);
-            }
-        }).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
-
-        doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
-        mFragment.onLongClick(new View(mRealContext));
-        TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
-        Robolectric.flushBackgroundThreadScheduler();
-        assertThat(summary1.getText().toString()).contains(NEW_ML_EST_SUFFIX);
-        assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
-    }
-
-    @Test
-    public void debugMode() {
-        doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
-
-        mFragment.restartBatteryInfoLoader();
-        ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
-                View.OnLongClickListener.class);
-        verify(mSummary1).setOnLongClickListener(listener.capture());
-
-        // Calling the listener should disable it.
-        listener.getValue().onLongClick(mSummary1);
-        verify(mSummary1).setOnLongClickListener(null);
-
-        // Restarting the loader should reset the listener.
-        mFragment.restartBatteryInfoLoader();
-        verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));
-    }
-
-    @Test
     public void refreshUi_deviceRotate_doNotUpdateBatteryTip() {
         mFragment.mBatteryTipPreferenceController = mock(BatteryTipPreferenceController.class);
         when(mFragment.mBatteryTipPreferenceController.needUpdate()).thenReturn(false);
@@ -330,23 +255,5 @@
             // Override it so we can access this method in test
             return super.getContentResolver();
         }
-
-        @Override
-        void showBothEstimates() {
-            List<BatteryInfo> fakeBatteryInfo = new ArrayList<>(2);
-            BatteryInfo info1 = new BatteryInfo();
-            info1.batteryLevel = 10;
-            info1.remainingTimeUs = 10000;
-            info1.discharging = true;
-
-            BatteryInfo info2 = new BatteryInfo();
-            info2.batteryLevel = 10;
-            info2.remainingTimeUs = 10000;
-            info2.discharging = true;
-
-            fakeBatteryInfo.add(info1);
-            fakeBatteryInfo.add(info2);
-            updateViews(fakeBatteryInfo);
-        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
rename to tests/robotests/src/com/android/settings/location/LocationServicesTest.java
index 649726a..f115845 100644
--- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
@@ -32,7 +32,7 @@
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class ScanningSettingsTest {
+public class LocationServicesTest {
 
     private Context mContext;
 
@@ -43,10 +43,10 @@
 
     @Test
     public void searchProvider_shouldIndexDefaultXml() {
-        final List<SearchIndexableResource> sir = ScanningSettings.SEARCH_INDEX_DATA_PROVIDER
+        final List<SearchIndexableResource> sir = LocationServices.SEARCH_INDEX_DATA_PROVIDER
                 .getXmlResourcesToIndex(mContext, true /* enabled */);
 
         assertThat(sir).hasSize(1);
-        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_services);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index 71a80de..5feee60 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -24,19 +24,17 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.provider.DeviceConfig;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settingslib.location.RecentLocationAccesses;
-import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -55,11 +53,14 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowDeviceConfig.class})
 public class RecentLocationAccessPreferenceControllerTest {
+    private static final String PREFERENCE_KEY = "test_preference_key";
     @Mock
-    private LayoutPreference mLayoutPreference;
+    private PreferenceCategory mLayoutPreference;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
     private RecentLocationAccesses mRecentLocationApps;
 
     private Context mContext;
@@ -71,15 +72,16 @@
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         mController = spy(
-                new RecentLocationAccessPreferenceController(mContext, mRecentLocationApps));
+                new RecentLocationAccessPreferenceController(mContext, PREFERENCE_KEY,
+                        mRecentLocationApps));
+        mController.init(mDashboardFragment);
         final String key = mController.getPreferenceKey();
         mAppEntitiesHeaderView = LayoutInflater.from(mContext).inflate(
                 R.layout.app_entities_header, null /* root */);
         when(mScreen.findPreference(key)).thenReturn(mLayoutPreference);
         when(mLayoutPreference.getKey()).thenReturn(key);
         when(mLayoutPreference.getContext()).thenReturn(mContext);
-        when(mLayoutPreference.findViewById(R.id.app_entities_header)).thenReturn(
-                mAppEntitiesHeaderView);
+        when(mDashboardFragment.getContext()).thenReturn(mContext);
     }
 
     @After
@@ -88,16 +90,7 @@
     }
 
     @Test
-    public void isAvailable_permissionHubNotSet_shouldReturnFalse() {
-        // We have not yet set the property to show the Permissions Hub.
-        assertThat(mController.isAvailable()).isEqualTo(false);
-    }
-
-    @Test
-    public void isAvailable_permissionHubEnabled_shouldReturnTrue() {
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
-                Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
-
+    public void isAvailable_shouldReturnTrue() {
         assertThat(mController.isAvailable()).isEqualTo(true);
     }
 
@@ -118,39 +111,6 @@
         assertThat(details.hasOnClickListeners()).isTrue();
     }
 
-    @Test
-    public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
-        final List<RecentLocationAccesses.Access> accesses = createMockAccesses(6);
-        doReturn(accesses).when(mRecentLocationApps).getAppListSorted();
-        mController.displayPreference(mScreen);
-        mController.updateState(mLayoutPreference);
-
-        // The widget can display the top 3 apps from the list when there're more than 3.
-        final View app1View = mAppEntitiesHeaderView.findViewById(R.id.app1_view);
-        final ImageView appIconView1 = app1View.findViewById(R.id.app_icon);
-        final TextView appTitle1 = app1View.findViewById(R.id.app_title);
-
-        assertThat(app1View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView1.getDrawable()).isNotNull();
-        assertThat(appTitle1.getText()).isEqualTo("appTitle0");
-
-        final View app2View = mAppEntitiesHeaderView.findViewById(R.id.app2_view);
-        final ImageView appIconView2 = app2View.findViewById(R.id.app_icon);
-        final TextView appTitle2 = app2View.findViewById(R.id.app_title);
-
-        assertThat(app2View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView2.getDrawable()).isNotNull();
-        assertThat(appTitle2.getText()).isEqualTo("appTitle1");
-
-        final View app3View = mAppEntitiesHeaderView.findViewById(R.id.app3_view);
-        final ImageView appIconView3 = app3View.findViewById(R.id.app_icon);
-        final TextView appTitle3 = app3View.findViewById(R.id.app_title);
-
-        assertThat(app3View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView3.getDrawable()).isNotNull();
-        assertThat(appTitle3.getText()).isEqualTo("appTitle2");
-    }
-
     private List<RecentLocationAccesses.Access> createMockAccesses(int count) {
         final List<RecentLocationAccesses.Access> accesses = new ArrayList<>();
         for (int i = 0; i < count; i++) {
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
index dfb9a8f..c95797f 100644
--- a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
@@ -19,8 +19,13 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.net.wifi.WifiManager;
 import android.provider.Settings;
 
 import org.junit.Before;
@@ -29,6 +34,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class AdaptiveConnectivityTogglePreferenceControllerTest {
@@ -37,12 +43,16 @@
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock
+    WifiManager mWifiManager;
 
     private AdaptiveConnectivityTogglePreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         mController = new AdaptiveConnectivityTogglePreferenceController(mContext, PREF_KEY);
     }
 
@@ -61,6 +71,7 @@
         assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                 .isEqualTo(1);
+        verify(mWifiManager, atLeastOnce()).setWifiScoringEnabled(true);
     }
 
     @Test
@@ -73,5 +84,6 @@
         assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                 .isEqualTo(0);
+        verify(mWifiManager).setWifiScoringEnabled(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
index 3b1f008..d3a3129 100644
--- a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
@@ -26,7 +26,6 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.TetheringManager;
 
 import androidx.preference.SwitchPreference;
@@ -44,7 +43,7 @@
 public class BluetoothTetherPreferenceControllerTest {
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private TetherEnabler mTetherEnabler;
 
@@ -58,9 +57,8 @@
 
         mContext = spy(ApplicationProvider.getApplicationContext());
         mSwitchPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""});
         mController = new BluetoothTetherPreferenceController(mContext, "BLUETOOTH");
         mController.setTetherEnabler(mTetherEnabler);
         ReflectionHelpers.setField(mController, "mPreference", mSwitchPreference);
@@ -98,7 +96,7 @@
 
     @Test
     public void shouldShow_noBluetoothTetherable() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
         assertThat(mController.isAvailable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
index d2e53b8..b269b05 100644
--- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.EthernetManager;
 import android.net.TetheringManager;
 
@@ -49,7 +48,7 @@
     public MockitoRule mocks = MockitoJUnit.rule();
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private EthernetManager mEthernetManager;
     @Mock
@@ -64,9 +63,8 @@
     public void setUp() {
         mContext = spy(ApplicationProvider.getApplicationContext());
         mPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX});
         when(mContext.getSystemService(Context.ETHERNET_SERVICE)).thenReturn(mEthernetManager);
         mController = new EthernetTetherPreferenceController(mContext, "ethernet");
         mController.setTetherEnabler(mTetherEnabler);
@@ -105,7 +103,7 @@
 
     @Test
     public void shouldEnable_noTetherable() {
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
         assertThat(mController.shouldEnable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
index 87806be..bb4b0c4 100644
--- a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
@@ -101,9 +101,9 @@
         when(context.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(context.getSystemService(Context.NETWORK_POLICY_SERVICE)).thenReturn(
                 mNetworkPolicyManager);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
         panReference.set(mBluetoothPan);
         mEnabler = spy(new TetherEnabler(context, mSwitchWidgetController, panReference));
         ReflectionHelpers.setField(mEnabler, "mBluetoothAdapter", mBluetoothAdapter);
@@ -111,8 +111,8 @@
 
     @Test
     public void lifecycle_onStart_setCheckedCorrectly() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
 
         mEnabler.onStart();
         assertThat(mSwitchBar.isChecked()).isTrue();
@@ -150,7 +150,7 @@
         mEnabler.onStart();
         mEnabler.startTethering(TetheringManager.TETHERING_WIFI);
 
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
         mEnabler.mOnStartTetheringCallback.onTetheringFailed();
 
         assertThat(mSwitchBar.isChecked()).isFalse();
@@ -255,8 +255,8 @@
 
     @Test
     public void updateState_shouldEnableSwitchBarTethering() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
 
         mSwitchWidgetController.setListener(mEnabler);
         mSwitchWidgetController.startListening();
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 3958589..4824eb2 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -33,6 +33,7 @@
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
@@ -56,7 +57,7 @@
     @Mock
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
@@ -69,7 +70,7 @@
         MockitoAnnotations.initMocks(this);
         mController = spy(TetherPreferenceController.class);
         ReflectionHelpers.setField(mController, "mContext", mContext);
-        ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager);
+        ReflectionHelpers.setField(mController, "mTetheringManager", mTetheringManager);
         ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
         ReflectionHelpers.setField(mController, "mPreference", mPreference);
     }
@@ -106,16 +107,16 @@
     }
 
     @Test
-    public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
+    public void updateSummary_noPreference_noInteractionWithTetheringManager() {
         ReflectionHelpers.setField(mController, "mPreference", null);
         mController.updateSummary();
-        verifyNoMoreInteractions(mConnectivityManager);
+        verifyNoMoreInteractions(mTetheringManager);
     }
 
     @Test
     public void updateSummary_wifiTethered_shouldShowHotspotMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_off);
@@ -123,8 +124,8 @@
 
     @Test
     public void updateSummary_btThetherOn_shouldShowTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_off_tether_on);
@@ -132,8 +133,8 @@
 
     @Test
     public void updateSummary_tetherOff_shouldShowTetherOffMessage() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.switch_off_text);
@@ -141,9 +142,9 @@
 
     @Test
     public void updateSummary_wifiBtTetherOn_shouldShowHotspotAndTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
diff --git a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
index 066084e..e02da90 100644
--- a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.TetheringManager;
 
 import androidx.preference.SwitchPreference;
@@ -43,7 +42,7 @@
 public class UsbTetherPreferenceControllerTest {
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private TetherEnabler mTetherEnabler;
 
@@ -56,9 +55,8 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{""});
         mController = new UsbTetherPreferenceController(mContext, "USB");
         mController.setTetherEnabler(mTetherEnabler);
         mSwitchPreference = spy(SwitchPreference.class);
@@ -94,7 +92,7 @@
 
     @Test
     public void shouldShow_noTetherableUsb() {
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
         assertThat(mController.shouldShow()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
index 1d2042c..a82a71f 100644
--- a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -77,7 +77,7 @@
     }
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private PreferenceScreen mPreferenceScreen;
     @Mock
@@ -100,9 +100,8 @@
 
         mContext = spy(ApplicationProvider.getApplicationContext());
         mPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{""});
         mController = new WifiTetherDisablePreferenceController(mContext, WIFI_TETHER_DISABLE_KEY);
         mController.setTetherEnabler(mTetherEnabler);
         ReflectionHelpers.setField(mController, "mScreen", mPreferenceScreen);
@@ -112,7 +111,7 @@
 
     @Test
     public void shouldShow_noTetherableWifi() {
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[0]);
         assertThat(mController.shouldShow()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
index 6714031..8113f22 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
@@ -33,6 +33,12 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.service.notification.ConversationChannelWrapper;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.BulletSpan;
+import android.text.style.QuoteSpan;
+import android.text.style.SubscriptSpan;
+import android.text.style.UnderlineSpan;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -211,6 +217,29 @@
                 ccw.getNotificationChannel().getConversationId());
     }
 
+    @Test
+    public void testCompareSpans() {
+        ConversationChannelWrapper one = new ConversationChannelWrapper();
+        String text1 = "one one";
+        SpannableStringBuilder builder1 = new SpannableStringBuilder(text1);
+        Object first1 = new SubscriptSpan();
+        builder1.setSpan(first1, 2, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ShortcutInfo s1 = new ShortcutInfo.Builder(mContext, "one").setShortLabel(
+                builder1).build();
+        one.setShortcutInfo(s1);
+
+        ConversationChannelWrapper two = new ConversationChannelWrapper();
+        String text2 = "two two";
+        SpannableStringBuilder builder2 = new SpannableStringBuilder(text2);
+        Object first2 = new SubscriptSpan();
+        builder2.setSpan(first2, 2, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ShortcutInfo s2 = new ShortcutInfo.Builder(mContext, "two").setShortLabel(
+                builder2).build();
+        two.setShortcutInfo(s2);
+
+        assertThat(mController.mConversationComparator.compare(one, two)).isLessThan(0);
+    }
+
     private final class TestPreferenceController extends ConversationListPreferenceController {
 
         private TestPreferenceController(Context context, NotificationBackend backend) {
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 23b7edc..f5e2a50 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -20,6 +20,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 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.spy;
@@ -43,6 +44,8 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -85,9 +88,12 @@
 
     @Test
     public void requestHighlight_hasKey_notHighlightedBefore_shouldRequest() {
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        when(mAdapter.getPreferenceAdapterPosition(anyString())).thenReturn(1);
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class), mock(AppBarLayout.class));
 
         verify(mRoot).postDelayed(any(),
+                eq(HighlightablePreferenceGroupAdapter.DELAY_COLLAPSE_DURATION_MILLIS));
+        verify(mRoot).postDelayed(any(),
                 eq(HighlightablePreferenceGroupAdapter.DELAY_HIGHLIGHT_DURATION_MILLIS));
     }
 
@@ -95,21 +101,21 @@
     public void requestHighlight_noKey_highlightedBefore_noRecyclerView_shouldNotRequest() {
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", null);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class),  mock(AppBarLayout.class));
 
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", TEST_KEY);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", true);
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class), mock(AppBarLayout.class));
 
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", TEST_KEY);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
-        mAdapter.requestHighlight(mRoot, null /* recyclerView */);
+        mAdapter.requestHighlight(mRoot, null /* recyclerView */,  mock(AppBarLayout.class));
 
         verifyZeroInteractions(mRoot);
     }
 
     @Test
-    public void adjustInitialExpandedChildCount_invalidInput_shouldNotadjust() {
+    public void adjustInitialExpandedChildCount_invalidInput_shouldNotAdjust() {
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(null /* host */);
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
         final Bundle args = new Bundle();
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 22e18bb..d227ac1 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -18,9 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -33,9 +30,6 @@
 import android.net.wifi.WifiEnterpriseConfig.Eap;
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
-import android.os.ServiceSpecificException;
-import android.security.Credentials;
-import android.security.KeyStore;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -51,9 +45,12 @@
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.wifitrackerlib.WifiEntry;
 
+import com.google.common.collect.ImmutableList;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,7 +76,7 @@
     @Mock
     private WifiEntry mWifiEntry;
     @Mock
-    private KeyStore mKeyStore;
+    private AndroidKeystoreAliasLoader mAndroidKeystoreAliasLoader;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
     private Spinner mEapCaCertSpinner;
@@ -286,27 +283,11 @@
     }
 
     @Test
-    public void loadCertificates_keyStoreListFail_shouldNotCrash() {
-        // Set up
-        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
-        when(mKeyStore.list(anyString()))
-            .thenThrow(new ServiceSpecificException(-1, "permission error"));
-
-        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
-              WifiConfigUiBase2.MODE_CONNECT);
-
-        // Verify that the EAP method menu is visible.
-        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.VISIBLE);
-        // No Crash
-    }
-
-    @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController2.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
-                "prefix",
+                Arrays.asList(WifiConfigController.UNDESIRED_CERTIFICATES),
                 "doNotProvideEapUserCertString",
                 false /* showMultipleCerts */,
                 false /* showUsePreinstalledCertOption */);
@@ -432,8 +413,8 @@
         }
 
         @Override
-        KeyStore getKeyStore() {
-            return mKeyStore;
+        AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+            return mAndroidKeystoreAliasLoader;
         }
     }
 
@@ -882,6 +863,7 @@
             String savedUserCertificate) {
         final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
         final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+
         mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
         when(mWifiEntry.isSaved()).thenReturn(true);
         when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
@@ -892,15 +874,15 @@
             String[] savedCaCertificates = new String[]{savedCaCertificate};
             when(mockWifiEnterpriseConfig.getCaCertificateAliases())
                     .thenReturn(savedCaCertificates);
-            when(mKeyStore.list(eq(Credentials.CA_CERTIFICATE), anyInt()))
-                    .thenReturn(savedCaCertificates);
+            when(mAndroidKeystoreAliasLoader.getCaCertAliases())
+                    .thenReturn(ImmutableList.of(savedCaCertificate));
         }
         if (savedUserCertificate != null) {
             String[] savedUserCertificates = new String[]{savedUserCertificate};
             when(mockWifiEnterpriseConfig.getClientCertificateAlias())
                     .thenReturn(savedUserCertificate);
-            when(mKeyStore.list(eq(Credentials.USER_PRIVATE_KEY), anyInt()))
-                    .thenReturn(savedUserCertificates);
+            when(mAndroidKeystoreAliasLoader.getKeyCertAliases())
+                    .thenReturn(ImmutableList.of(savedUserCertificate));
         }
 
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 455e9f1..80543ec 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -21,7 +21,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -34,8 +33,6 @@
 import android.net.wifi.WifiEnterpriseConfig.Eap;
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
-import android.os.ServiceSpecificException;
-import android.security.KeyStore;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -77,8 +74,6 @@
     private Context mContext;
     @Mock
     private AccessPoint mAccessPoint;
-    @Mock
-    private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
     private ShadowSubscriptionManager mShadowSubscriptionManager;
@@ -267,27 +262,11 @@
     }
 
     @Test
-    public void loadCertificates_keyStoreListFail_shouldNotCrash() {
-        // Set up
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
-        when(mKeyStore.list(anyString()))
-            .thenThrow(new ServiceSpecificException(-1, "permission error"));
-
-        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
-              WifiConfigUiBase.MODE_CONNECT);
-
-        // Verify that the EAP method menu is visible.
-        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.VISIBLE);
-        // No Crash
-    }
-
-    @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
-                "prefix",
+                Arrays.asList(WifiConfigController.UNDESIRED_CERTIFICATES),
                 "doNotProvideEapUserCertString",
                 false /* showMultipleCerts */,
                 false /* showUsePreinstalledCertOption */);
@@ -412,8 +391,6 @@
             super(parent, view, accessPoint, mode, wifiManager);
         }
 
-        @Override
-        KeyStore getKeyStore() { return mKeyStore; }
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 2e93faa..8ab3ad2 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -27,7 +27,6 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -55,8 +54,7 @@
 import com.android.settings.network.ims.MockWifiCallingQueryImsState;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settings.widget.SwitchBar;
-import com.android.settings.widget.ToggleSwitch;
+import com.android.settings.widget.SettingsMainSwitchBar;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -85,19 +83,28 @@
     private final PersistableBundle mBundle = new PersistableBundle();
 
     private MockWifiCallingQueryImsState mQueryImsState;
+    private SettingsMainSwitchBar mSwitchBar;
 
-    @Mock private static CarrierConfigManager sCarrierConfigManager;
-    @Mock private CarrierConfigManager mMockConfigManager;
-    @Mock private ImsMmTelManager mImsMmTelManager;
-    @Mock private TelephonyManager mTelephonyManager;
-    @Mock private PreferenceScreen mPreferenceScreen;
-    @Mock private SettingsActivity mActivity;
-    @Mock private SwitchBar mSwitchBar;
-    @Mock private ToggleSwitch mToggleSwitch;
-    @Mock private View mView;
-    @Mock private ListWithEntrySummaryPreference mButtonWfcMode;
-    @Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
-    @Mock private Preference mUpdateAddress;
+    @Mock
+    private static CarrierConfigManager sCarrierConfigManager;
+    @Mock
+    private CarrierConfigManager mMockConfigManager;
+    @Mock
+    private ImsMmTelManager mImsMmTelManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private View mView;
+    @Mock
+    private ListWithEntrySummaryPreference mButtonWfcMode;
+    @Mock
+    private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
+    @Mock
+    private Preference mUpdateAddress;
 
     @Before
     public void setUp() throws Exception {
@@ -125,7 +132,7 @@
         mEmptyView = new TextView(mContext);
         doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
 
-        ReflectionHelpers.setField(mSwitchBar, "mSwitch", mToggleSwitch);
+        mSwitchBar = new SettingsMainSwitchBar(mContext);
         doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
 
         mQueryImsState = new MockWifiCallingQueryImsState(mContext, SUB_ID);
@@ -364,6 +371,7 @@
         }
 
         @Override
-        void showAlert(Intent intent) {}
+        void showAlert(Intent intent) {
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
index e639b67..d777a59 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -57,7 +57,7 @@
 
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -74,9 +74,8 @@
         mContext = spy(RuntimeEnvironment.application);
         mPreference = new ListPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         when(mWifiManager.getSoftApConfiguration()).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
index b0ed862..25ad730 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 
 import androidx.preference.PreferenceScreen;
@@ -43,7 +43,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -58,9 +58,8 @@
         MockitoAnnotations.initMocks(this);
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         mController = new WifiTetherFooterPreferenceController(mContext);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
     }
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 7835f7e..8f8477f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -53,7 +53,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -77,9 +77,8 @@
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index 920582f..23bb0db 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -56,7 +56,7 @@
 
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -77,14 +77,13 @@
         mLifecycle = new Lifecycle(mLifecycleOwner);
         FakeFeatureFactory.setupForTest();
         mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mSoftApConfiguration = new SoftApConfiguration.Builder().setSsid(SSID).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
 
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         mController = new WifiTetherPreferenceController(mContext, mLifecycle,
                 false /* initSoftApManager */);
         mController.displayPreference(mScreen);
@@ -92,7 +91,7 @@
 
     @Test
     public void isAvailable_noTetherRegex_shouldReturnFalse() {
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
         mController = new WifiTetherPreferenceController(mContext, mLifecycle,
                 false /* initSoftApManager */);
 
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 a6a9dda..147cd64 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -49,7 +49,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -68,9 +68,8 @@
         mPreference = new WifiTetherSsidPreference(RuntimeEnvironment.application);
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mController = new WifiTetherSSIDPreferenceController(mContext, mListener,
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index b41616b..a241296 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -30,6 +30,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -70,6 +71,8 @@
     private ConnectivityManager mConnectivityManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private TetheringManager mTetheringManager;
 
     @Before
     public void setUp() {
@@ -78,7 +81,8 @@
         MockitoAnnotations.initMocks(this);
         doReturn(mConnectivityManager)
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
+        doReturn(mTetheringManager).when(mContext).getSystemService(Context.TETHERING_SERVICE);
+        doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
 
         mWifiTetherSettings = new WifiTetherSettings();
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index 8a3e374..8636c81 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsUITests",
     platform_apis: true,
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index b857a0a..b55a788 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsUnitTests",
 
diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
index ba7a0d2..9c50d61 100644
--- a/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.manageapplications;
 
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_ALARMS_AND_REMINDERS;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
@@ -23,6 +24,7 @@
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
@@ -59,6 +61,9 @@
         assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
                 .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
 
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_ALARMS_AND_REMINDERS))
+                .isEqualTo(FILTER_ALARMS_AND_REMINDERS);
+
         assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
         assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
                 .isEqualTo(FILTER_APPS_RECENT);
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..7eebba0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AlertingTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private AlertingTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new AlertingTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_ALERTING);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
index 3cdbd3a..90b8927 100644
--- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
@@ -35,10 +35,10 @@
 import android.service.notification.NotificationListenerFilter;
 import android.util.ArraySet;
 
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -122,7 +122,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
 
-        SwitchPreference p = mock(SwitchPreference.class);
+        CheckBoxPreference p = mock(CheckBoxPreference.class);
         when(p.getKey()).thenReturn("pkg|12300");
         mScreen.addPreference(p);
 
@@ -163,7 +163,7 @@
 
         mController.onRebuildComplete(entries);
 
-        SwitchPreference actual = mScreen.findPreference("pkg|12300");
+        CheckBoxPreference actual = mScreen.findPreference("pkg|12300");
 
         assertThat(actual.isChecked()).isTrue();
         assertThat(actual.getTitle()).isEqualTo("hi");
@@ -180,7 +180,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        SwitchPreference pref = new SwitchPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
         pref.setKey("pkg|567");
 
         mController.onPreferenceChange(pref, false);
@@ -206,7 +206,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        SwitchPreference pref = new SwitchPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
         pref.setKey("pkg|567");
 
         mController.onPreferenceChange(pref, true);
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..e12ebeb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ConversationTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private ConversationTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new ConversationTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
new file mode 100644
index 0000000..4338198
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+beverlyt@google.com
+dsandler@android.com
+juliacr@google.com
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..eead848
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class OngoingTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private OngoingTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new OngoingTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_ONGOING);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..1d099e3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class SilentTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private SilentTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new SilentTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_SILENT);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
index 3014066..d36f775 100644
--- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
@@ -28,10 +28,13 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
 import android.service.notification.NotificationListenerFilter;
+import android.service.notification.NotificationListenerService;
 import android.util.ArraySet;
 
-import androidx.preference.MultiSelectListPreference;
+import androidx.preference.CheckBoxPreference;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -54,23 +57,76 @@
     @Mock
     NotificationBackend mNm;
     ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    private static class TestTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+        public TestTypeFilterPreferenceController(Context context, String key) {
+            super(context, key);
+        }
+
+        @Override
+        protected int getType() {
+            return 32;
+        }
+    }
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = ApplicationProvider.getApplicationContext();
 
-        mController = new TypeFilterPreferenceController(mContext, "key");
+        mController = new TestTypeFilterPreferenceController(mContext, "key");
         mController.setCn(mCn);
         mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
         mController.setUserId(0);
     }
 
     @Test
-    public void updateState_enabled() {
+    public void updateState_enabled_noMetaData() {
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_notTheDisableFilter() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence("test", "value");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_disableFilter_notThisField() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, 
+                "1,2");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_disableFilter_thisField_stateIsChecked() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES,
+                "1,2,32");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(
+                new NotificationListenerFilter(32, new ArraySet<>()));
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
         mController.updateState(pref);
         assertThat(pref.isEnabled()).isTrue();
@@ -80,57 +136,86 @@
     public void updateState_disabled() {
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(false);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
         mController.updateState(pref);
         assertThat(pref.isEnabled()).isFalse();
     }
 
     @Test
-    public void updateState() {
-        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
-                | FLAG_FILTER_TYPE_SILENT, new ArraySet<>());
+    public void updateState_disabled_metaData_disableFilter_thisField_stateIsNotChecked() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES,
+                "1,2,32");
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
-        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+        NotificationListenerFilter before = new NotificationListenerFilter(4, new ArraySet<>());
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(before);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
         mController.updateState(pref);
-
-        assertThat(pref.getValues()).containsExactlyElementsIn(
-                new String[] {String.valueOf(FLAG_FILTER_TYPE_ONGOING),
-                        String.valueOf(FLAG_FILTER_TYPE_SILENT)});
-        assertThat(pref.getSummary()).isNotNull();
+        assertThat(pref.isChecked()).isFalse();
+        assertThat(pref.isEnabled()).isFalse();
     }
 
     @Test
-    public void getSummary() {
+    public void updateState_checked() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(mController.getType(),
+                new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_unchecked() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(mController.getType() - 1,
+                new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(pref.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_true() {
         NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
                 | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
-        mController.updateState(pref);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
-        assertThat(mController.getSummary().toString()).ignoringCase().contains("ongoing");
-        assertThat(mController.getSummary().toString()).ignoringCase().contains("conversation");
-    }
-
-    @Test
-    public void onPreferenceChange() {
-        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
-                | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
-        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
-        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
-
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
-
-        mController.onPreferenceChange(pref, Set.of("8", "1", "4"));
+        mController.onPreferenceChange(pref, true);
 
         ArgumentCaptor<NotificationListenerFilter> captor =
                 ArgumentCaptor.forClass(NotificationListenerFilter.class);
         verify(mNm).setListenerFilter(eq(mCn), eq(0), captor.capture());
         assertThat(captor.getValue().getTypes()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS
-                | FLAG_FILTER_TYPE_SILENT | FLAG_FILTER_TYPE_ONGOING);
+                | FLAG_FILTER_TYPE_ONGOING | mController.getType());
+    }
+
+    @Test
+    public void onPreferenceChange_false() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
+                | FLAG_FILTER_TYPE_CONVERSATIONS | mController.getType(), new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.onPreferenceChange(pref, false);
+
+        ArgumentCaptor<NotificationListenerFilter> captor =
+                ArgumentCaptor.forClass(NotificationListenerFilter.class);
+        verify(mNm).setListenerFilter(eq(mCn), eq(0), captor.capture());
+        assertThat(captor.getValue().getTypes()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS
+                | FLAG_FILTER_TYPE_ONGOING);
     }
 }
diff --git a/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..0903c72
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import static com.android.settings.development.transcode.TranscodeNotificationPreferenceController.TRANSCODE_NOTIFICATION_SYS_PROP_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TranscodeNotificationPreferenceControllerTest {
+    private TranscodeNotificationPreferenceController mUnderTest;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mUnderTest = new TranscodeNotificationPreferenceController(context, "notification_key");
+    }
+
+    @Test
+    public void isChecked_whenSysPropSet_shouldReturnTrue() {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, "true");
+        assertThat(mUnderTest.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenSysPropUnset_shouldReturnFalse() {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, "false");
+        assertThat(mUnderTest.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldSetSysProp() {
+        mUnderTest.setChecked(true);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, false)).isTrue();
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUnsetSysProp() {
+        mUnderTest.setChecked(false);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, true)).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturn_isAvailable() {
+        assertThat(mUnderTest.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index 72e9be4..d205607 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -40,6 +40,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 
 import androidx.slice.Slice;
 import androidx.slice.builders.GridRowBuilder;
@@ -169,7 +170,7 @@
     @Test
     public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() {
         String expectDisplayName = "Name1";
-        String expectedSubtitle = "5G";
+        CharSequence expectedSubtitle = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY);
         String networkType = "5G";
 
         final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
@@ -199,8 +200,9 @@
         String networkType = "5G";
         String connectedText = ResourcesUtils.getResourcesString(mContext,
                 "mobile_data_connection_active");
-        String expectedSubtitle = ResourcesUtils.getResourcesString(mContext,
-                "preference_summary_default_combination", connectedText, networkType);
+        CharSequence expectedSubtitle = Html.fromHtml(ResourcesUtils.getResourcesString(mContext,
+                "preference_summary_default_combination", connectedText, networkType),
+                Html.FROM_HTML_MODE_LEGACY);
 
         final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
         when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index ef3f130..6b31342 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
 import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
 import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
 import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -24,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;;
 import static org.mockito.Mockito.doReturn;
@@ -47,6 +47,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
@@ -371,14 +372,14 @@
         final Preference pref = new Preference(mContext);
         final Drawable greatDrawWithoutCutOff = mock(Drawable.class);
         doReturn(greatDrawWithoutCutOff).when(sInjector)
-                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+                .getIcon(any(), anyInt(), anyInt(), anyBoolean());
 
         mController.setIcon(pref, 1, true /* isDefaultForData */);
         assertThat(pref.getIcon()).isEqualTo(greatDrawWithoutCutOff);
 
         final Drawable greatDrawWithCutOff = mock(Drawable.class);
         doReturn(greatDrawWithCutOff).when(sInjector)
-                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+                .getIcon(any(), anyInt(), anyInt(), anyBoolean());
         mController.setIcon(pref, 2, false /* isDefaultForData */);
         assertThat(pref.getIcon()).isEqualTo(greatDrawWithCutOff);
     }
@@ -416,7 +417,8 @@
     @Test
     @UiThreadTest
     public void displayPreference_providerAndHasMultiSimAndActive_connectedAndRat() {
-        final String expectedSummary = "Connected / 5G";
+        final CharSequence expectedSummary =
+                Html.fromHtml("Connected / 5G", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "5G";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
@@ -426,6 +428,7 @@
         doReturn(mock(MobileMappings.Config.class)).when(sInjector).getConfig(mContext);
         doReturn(networkType)
                 .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
 
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
@@ -435,8 +438,11 @@
 
     @Test
     @UiThreadTest
-    public void displayPreference_providerAndHasMultiSimAndNotActive_showRatOnly() {
-        final String expectedSummary = "5G";
+    public void displayPreference_providerAndHasMultiSimButMobileDataOff_notAutoConnect() {
+        final String dataOffSummary =
+                ResourcesUtils.getResourcesString(mContext, "mobile_data_off_summary");
+        final CharSequence expectedSummary =
+                Html.fromHtml(dataOffSummary, Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "5G";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
@@ -449,6 +455,27 @@
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
 
+        assertThat(mPreferenceCategory.getPreference(0).getSummary())
+            .isEqualTo(expectedSummary.toString());
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndHasMultiSimAndNotActive_showRatOnly() {
+        final CharSequence expectedSummary = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY);
+        final String networkType = "5G";
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        setupGetIconConditions(sub.get(0).getSubscriptionId(), false, true,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+        doReturn(networkType)
+                .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
         assertThat(mPreferenceCategory.getPreference(0).getSummary()).isEqualTo(expectedSummary);
     }
 
@@ -467,7 +494,8 @@
     @Test
     @UiThreadTest
     public void onTelephonyDisplayInfoChanged_providerAndHasMultiSimAndActive_connectedAndRat() {
-        final String expectedSummary = "Connected / LTE";
+        final CharSequence expectedSummary =
+                Html.fromHtml("Connected / LTE", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "LTE";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         final TelephonyDisplayInfo telephonyDisplayInfo =
@@ -480,6 +508,7 @@
         doReturn(mock(MobileMappings.Config.class)).when(sInjector).getConfig(mContext);
         doReturn(networkType)
                 .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
 
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
@@ -491,7 +520,8 @@
     @Test
     @UiThreadTest
     public void onTelephonyDisplayInfoChanged_providerAndHasMultiSimAndNotActive_showRat() {
-        final String expectedSummary = "LTE";
+        final CharSequence expectedSummary =
+                Html.fromHtml("LTE", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "LTE";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         final TelephonyDisplayInfo telephonyDisplayInfo =
@@ -504,6 +534,7 @@
         doReturn(mock(MobileMappings.Config.class)).when(sInjector).getConfig(mContext);
         doReturn(networkType)
                 .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
 
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
diff --git a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
index 9b9bb11..293a19d 100644
--- a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
@@ -22,6 +22,8 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -117,4 +119,27 @@
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
+
+    @Test
+    public void onPreferenceChange_update() {
+        // Set "Enable 2G" flag to "on"
+        when(mTelephonyManager.getAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G)).thenReturn(
+                (long) (TelephonyManager.NETWORK_TYPE_BITMASK_GSM
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_LTE));
+
+        // Setup state to allow disabling
+        doReturn(true).when(mTelephonyManager).isRadioInterfaceCapabilitySupported(
+                mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G,
+                false);
+
+        // Disable 2G
+        boolean changed = mController.setChecked(false);
+        assertThat(changed).isEqualTo(true);
+
+        verify(mTelephonyManager, times(1)).setAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G,
+                TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/wifi/OWNERS b/tests/unit/src/com/android/settings/wifi/OWNERS
new file mode 100644
index 0000000..358c910
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/wifi/OWNERS