diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8e62c45..cb63df9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -164,7 +164,8 @@
         </receiver>
 
         <activity android:name=".SubSettings"
-                android:parentActivityName="Settings" />
+                android:parentActivityName="Settings"
+                android:theme="@style/Theme.SubSettings"/>
 
         <activity android:name=".Settings$CreateShortcutActivity"
                   android:label="@string/settings_shortcut">
@@ -1447,6 +1448,16 @@
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity-alias
+            android:name=".FontSizeSettingsForSetupWizardActivity"
+            android:exported="true"
+            android:targetActivity=".accessibility.AccessibilitySettingsForSetupWizardActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
@@ -1457,9 +1468,7 @@
                 android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
+        </activity-alias>
 
         <activity
             android:name="Settings$AccessibilityDaltonizerSettingsActivity"
@@ -1538,7 +1547,6 @@
         <activity android:name=".password.ConfirmDeviceCredentialActivity$InternalActivity"
             android:exported="false"
             android:permission="android.permission.MANAGE_USERS"
-            android:resizeableActivity="false"
             android:taskAffinity="com.android.settings.workmode"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter android:priority="1">
@@ -2705,10 +2713,8 @@
             </intent-filter>
         </activity>
 
-        <activity
+        <receiver
             android:name=".wifi.slice.ConnectToWifiHandler"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true"
             android:exported="false" />
 
         <activity
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 1031071..41cb12d 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -133,12 +133,12 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;switchbar_switch_track_tint&quot;>#82000000&lt;/color>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    &lt;color name=&quot;switchbar_switch_track_tint&quot;>#82000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-night/colors.xml"
             line="18"
-            column="3"/>
+            column="5"/>
     </issue>
 
     <issue
@@ -165,12 +165,12 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;homepage_accessibility_background&quot;>#783BE5&lt;/color>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    &lt;color name=&quot;homepage_accessibility_background&quot;>#783BE5&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-night/colors.xml"
             line="20"
-            column="3"/>
+            column="5"/>
     </issue>
 
     <issue
@@ -197,12 +197,12 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;homepage_support_background&quot;>#3F5FBD&lt;/color>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    &lt;color name=&quot;homepage_support_background&quot;>#3F5FBD&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-night/colors.xml"
             line="21"
-            column="3"/>
+            column="5"/>
     </issue>
 
     <issue
@@ -245,22 +245,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;homepage_status_bar_color&quot;>#cc000000&lt;/color>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="23"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;divider_color&quot;>#20ffffff&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -277,11 +261,43 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;notification_importance_button_selected&quot;>#AECBFA&lt;/color> &lt;!-- material blue 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-night/colors.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;notification_importance_button_unselected&quot;>#5F6368&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-night/colors.xml"
+            line="29"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_success_color_dark&quot;>#ff84ffff&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="27"
+            line="29"
             column="5"/>
     </issue>
 
@@ -297,7 +313,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="29"
+            line="31"
             column="5"/>
     </issue>
 
@@ -309,27 +325,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;notification_importance_button_selected&quot;>#AECBFA&lt;/color> &lt;!-- material blue 200 -->"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="30"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;setup_wizard_wifi_color_dark&quot;>#89ffffff&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="30"
+            line="32"
             column="5"/>
     </issue>
 
@@ -341,27 +341,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="  &lt;color name=&quot;notification_importance_button_unselected&quot;>#5F6368&lt;/color>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="31"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;setup_wizard_wifi_color_light&quot;>#89000000&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="31"
+            line="33"
             column="5"/>
     </issue>
 
@@ -377,7 +361,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="33"
+            line="35"
             column="5"/>
     </issue>
 
@@ -393,7 +377,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="34"
+            line="36"
             column="5"/>
     </issue>
 
@@ -409,7 +393,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="36"
+            line="38"
             column="5"/>
     </issue>
 
@@ -425,7 +409,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="41"
+            line="43"
             column="5"/>
     </issue>
 
@@ -441,7 +425,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="42"
+            line="44"
             column="5"/>
     </issue>
 
@@ -457,7 +441,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="44"
+            line="46"
             column="5"/>
     </issue>
 
@@ -473,7 +457,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="45"
+            line="47"
             column="5"/>
     </issue>
 
@@ -489,7 +473,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="49"
+            line="51"
             column="5"/>
     </issue>
 
@@ -505,7 +489,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="52"
+            line="54"
             column="5"/>
     </issue>
 
@@ -521,7 +505,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="55"
+            line="57"
             column="5"/>
     </issue>
 
@@ -537,7 +521,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="56"
+            line="58"
             column="5"/>
     </issue>
 
@@ -553,7 +537,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="57"
+            line="59"
             column="5"/>
     </issue>
 
@@ -569,7 +553,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="58"
+            line="60"
             column="5"/>
     </issue>
 
@@ -585,7 +569,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="60"
+            line="62"
             column="5"/>
     </issue>
 
@@ -601,7 +585,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="61"
+            line="63"
             column="5"/>
     </issue>
 
@@ -617,7 +601,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="62"
+            line="64"
             column="5"/>
     </issue>
 
@@ -633,7 +617,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="63"
+            line="65"
             column="5"/>
     </issue>
 
@@ -649,7 +633,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="64"
+            line="66"
             column="5"/>
     </issue>
 
@@ -665,7 +649,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="65"
+            line="67"
             column="5"/>
     </issue>
 
@@ -681,7 +665,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="66"
+            line="68"
             column="5"/>
     </issue>
 
@@ -697,7 +681,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="67"
+            line="69"
             column="5"/>
     </issue>
 
@@ -713,7 +697,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="68"
+            line="70"
             column="5"/>
     </issue>
 
@@ -729,7 +713,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="69"
+            line="71"
             column="5"/>
     </issue>
 
@@ -745,7 +729,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="71"
+            line="73"
             column="5"/>
     </issue>
 
@@ -761,7 +745,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="74"
+            line="76"
             column="5"/>
     </issue>
 
@@ -777,7 +761,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="77"
+            line="79"
             column="5"/>
     </issue>
 
@@ -793,7 +777,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="80"
+            line="82"
             column="5"/>
     </issue>
 
@@ -809,7 +793,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="83"
+            line="85"
             column="5"/>
     </issue>
 
@@ -825,7 +809,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="84"
+            line="86"
             column="5"/>
     </issue>
 
@@ -841,7 +825,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="85"
+            line="87"
             column="5"/>
     </issue>
 
@@ -857,7 +841,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="86"
+            line="88"
             column="5"/>
     </issue>
 
@@ -873,7 +857,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="87"
+            line="89"
             column="5"/>
     </issue>
 
@@ -889,7 +873,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="88"
+            line="90"
             column="5"/>
     </issue>
 
@@ -905,7 +889,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="89"
+            line="91"
             column="5"/>
     </issue>
 
@@ -921,7 +905,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="90"
+            line="92"
             column="5"/>
     </issue>
 
@@ -937,7 +921,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="91"
+            line="93"
             column="5"/>
     </issue>
 
@@ -953,7 +937,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="92"
+            line="94"
             column="5"/>
     </issue>
 
@@ -969,7 +953,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="93"
+            line="95"
             column="5"/>
     </issue>
 
@@ -985,7 +969,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="94"
+            line="96"
             column="5"/>
     </issue>
 
@@ -1001,7 +985,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="95"
+            line="97"
             column="5"/>
     </issue>
 
@@ -1017,7 +1001,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="96"
+            line="98"
             column="5"/>
     </issue>
 
@@ -1033,7 +1017,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="97"
+            line="99"
             column="5"/>
     </issue>
 
@@ -1049,7 +1033,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="98"
+            line="100"
             column="5"/>
     </issue>
 
@@ -1065,7 +1049,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="100"
+            line="102"
             column="5"/>
     </issue>
 
@@ -1081,7 +1065,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="106"
+            line="108"
             column="5"/>
     </issue>
 
@@ -1097,7 +1081,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="111"
+            line="113"
             column="5"/>
     </issue>
 
@@ -1113,7 +1097,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="112"
+            line="114"
             column="5"/>
     </issue>
 
@@ -1129,7 +1113,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="113"
+            line="115"
             column="5"/>
     </issue>
 
@@ -1145,7 +1129,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="114"
+            line="116"
             column="5"/>
     </issue>
 
@@ -1161,7 +1145,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="115"
+            line="117"
             column="5"/>
     </issue>
 
@@ -1177,7 +1161,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="116"
+            line="118"
             column="5"/>
     </issue>
 
@@ -1193,7 +1177,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="119"
+            line="121"
             column="5"/>
     </issue>
 
@@ -1209,7 +1193,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="120"
+            line="122"
             column="5"/>
     </issue>
 
@@ -1225,7 +1209,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="121"
+            line="123"
             column="5"/>
     </issue>
 
@@ -1241,7 +1225,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="122"
+            line="124"
             column="5"/>
     </issue>
 
@@ -1257,7 +1241,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="123"
+            line="125"
             column="5"/>
     </issue>
 
@@ -1273,7 +1257,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="126"
+            line="128"
             column="5"/>
     </issue>
 
@@ -1289,7 +1273,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="127"
+            line="129"
             column="5"/>
     </issue>
 
@@ -1305,7 +1289,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="128"
+            line="130"
             column="5"/>
     </issue>
 
@@ -1321,7 +1305,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="129"
+            line="131"
             column="5"/>
     </issue>
 
@@ -1337,7 +1321,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="130"
+            line="132"
             column="5"/>
     </issue>
 
@@ -1353,23 +1337,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="131"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;homepage_status_bar_color&quot;>#ccFFFFFF&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="137"
+            line="133"
             column="5"/>
     </issue>
 
@@ -1385,7 +1353,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="140"
+            line="139"
             column="5"/>
     </issue>
 
@@ -1401,7 +1369,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="141"
+            line="140"
             column="5"/>
     </issue>
 
@@ -1417,7 +1385,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="142"
+            line="141"
             column="5"/>
     </issue>
 
@@ -2617,7 +2585,7 @@
         errorLine2="                                                                                                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rXC/strings.xml"
-            line="2629"
+            line="2652"
             column="169"/>
     </issue>
 
@@ -2633,7 +2601,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2632"
+            line="2653"
             column="64"/>
     </issue>
 
@@ -2649,7 +2617,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2632"
+            line="2653"
             column="64"/>
     </issue>
 
@@ -2665,7 +2633,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2632"
+            line="2653"
             column="64"/>
     </issue>
 
@@ -2681,7 +2649,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2632"
+            line="2653"
             column="64"/>
     </issue>
 
@@ -2697,7 +2665,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6134"
+            line="6186"
             column="36"/>
     </issue>
 
@@ -2793,7 +2761,7 @@
         errorLine2="                                       ^">
         <location
             file="res/values/themes.xml"
-            line="99"
+            line="103"
             column="40"/>
     </issue>
 
@@ -2809,7 +2777,7 @@
         errorLine2="                                       ^">
         <location
             file="res/values/themes.xml"
-            line="99"
+            line="103"
             column="40"/>
     </issue>
 
@@ -2825,7 +2793,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="167"
+            line="171"
             column="45"/>
     </issue>
 
@@ -2841,7 +2809,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="168"
+            line="172"
             column="49"/>
     </issue>
 
@@ -2857,7 +2825,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="176"
+            line="180"
             column="45"/>
     </issue>
 
@@ -2873,7 +2841,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="177"
+            line="181"
             column="49"/>
     </issue>
 
@@ -2885,6 +2853,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:colorAccent&quot;>@color/material_blue_700&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="249"
+            column="42"/>
+    </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;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
         errorLine2="                                       ^">
         <location
diff --git a/res/drawable-nodpi/gesture_swipe_up.png b/res/drawable-nodpi/system_nav_2_button.png
similarity index 100%
rename from res/drawable-nodpi/gesture_swipe_up.png
rename to res/drawable-nodpi/system_nav_2_button.png
Binary files differ
diff --git a/res/drawable-nodpi/system_nav_3_button.png b/res/drawable-nodpi/system_nav_3_button.png
new file mode 100644
index 0000000..e78fc8b
--- /dev/null
+++ b/res/drawable-nodpi/system_nav_3_button.png
Binary files differ
diff --git a/res/drawable-nodpi/system_nav_fully_gestural.png b/res/drawable-nodpi/system_nav_fully_gestural.png
new file mode 100644
index 0000000..b301608
--- /dev/null
+++ b/res/drawable-nodpi/system_nav_fully_gestural.png
Binary files differ
diff --git a/res/drawable/ic_partial_system_update_current.xml b/res/drawable/ic_partial_system_update_current.xml
new file mode 100644
index 0000000..18be203
--- /dev/null
+++ b/res/drawable/ic_partial_system_update_current.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2019 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20.0"
+    android:viewportHeight="22.0">
+    <path
+        android:fillColor="#FF1E8E3E"
+        android:pathData="M15,17L5,17L5,14.33l1.59,1.58L8,14.5l-3,-3 -1,-1 -4,4 1.41,1.42L3,14.33L3,20a2.006,2.006 0,0 0,2 2L15,22a2.006,2.006 0,0 0,2 -2L17,13L15,13ZM15,20L5,20L5,19L15,19ZM5,5L15,5L15,7.67L13.41,6.09 12,7.5l4,4 4,-4L18.59,6.08 17,7.67L17,2a1.997,1.997 0,0 0,-2 -1.99L5,0A2.006,2.006 0,0 0,3 2v7L5,9ZM5,2L15,2L15,3L5,3Z"/>
+</vector>
diff --git a/res/drawable/ic_partial_system_update_stale.xml b/res/drawable/ic_partial_system_update_stale.xml
new file mode 100644
index 0000000..711be2c
--- /dev/null
+++ b/res/drawable/ic_partial_system_update_stale.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2019 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20.0"
+    android:viewportHeight="22.0">
+    <path
+        android:fillColor="#FFD93025"
+        android:pathData="M15,17L5,17L5,14.33l1.59,1.58L8,14.5l-3,-3 -1,-1 -4,4 1.41,1.42L3,14.33L3,20a2.006,2.006 0,0 0,2 2L15,22a2.006,2.006 0,0 0,2 -2L17,13L15,13ZM15,20L5,20L5,19L15,19ZM5,5L15,5L15,7.67L13.41,6.09 12,7.5l4,4 4,-4L18.59,6.08 17,7.67L17,2a1.997,1.997 0,0 0,-2 -1.99L5,0A2.006,2.006 0,0 0,3 2v7L5,9ZM5,2L15,2L15,3L5,3Z"/>
+</vector>
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml
index b90c3a5..d8d2e4f 100644
--- a/res/layout/captioning_preview.xml
+++ b/res/layout/captioning_preview.xml
@@ -15,41 +15,32 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/preview_viewport"
+    android:clipToPadding="true"
+    android:clipChildren="true"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/captioning_preview_height"
+        android:contentDescription="@null"
+        android:scaleType="centerCrop"
+        android:src="@drawable/caption_background"/>
 
     <FrameLayout
-        android:id="@+id/preview_viewport"
+        android:id="@+id/preview_window"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/captioning_preview_height" >
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|start"
+        android:padding="16dp">
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@null"
-            android:scaleType="centerCrop"
-            android:src="@drawable/caption_background" />
-
-        <FrameLayout
-            android:id="@+id/preview_window"
-            android:layout_width="match_parent"
+        <com.android.internal.widget.SubtitleView
+            android:id="@+id/preview_text"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|start"
-            android:padding="16dp" >
-
-            <com.android.internal.widget.SubtitleView
-                android:id="@+id/preview_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/captioning_preview_text" />
-        </FrameLayout>
+            android:text="@string/captioning_preview_text"/>
     </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/properties_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
+</FrameLayout>
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index c41c724..d7b95b6 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -40,16 +40,14 @@
             android:textAlignment="center"
             android:text="@string/security_settings_face_enroll_education_message"/>
 
-        <com.google.android.setupdesign.view.RichTextView
-            android:id="@+id/error_text"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+        <Space android:layout_width="match_parent"
+               android:layout_height="0dp"
+               android:layout_weight="1"/>
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="48dp">
+            android:layout_marginVertical="12dp">
 
             <com.google.android.setupdesign.view.IllustrationVideoView
                 android:id="@+id/illustration_normal"
@@ -68,6 +66,10 @@
 
         </FrameLayout>
 
+        <Space android:layout_width="match_parent"
+               android:layout_height="0dp"
+               android:layout_weight="1"/>
+
         <!-- Contains the buttons and extra information text at the bottom -->
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index 535a531..00ab443 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -43,12 +43,13 @@
             android:id="@+id/error_text"
             style="@style/SudDescription.Glif"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="48dp">
+            android:layout_marginVertical="12dp">
 
             <com.google.android.setupdesign.view.IllustrationVideoView
                 android:id="@+id/illustration_normal"
@@ -69,10 +70,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:paddingTop="24dp">
+                android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -80,7 +78,7 @@
                     android:background="@drawable/ic_face_enroll_introduction_shield">
                 </ImageView>
                 <Space
-                    android:layout_width="8dp"
+                    android:layout_width="24dp"
                     android:layout_height="wrap_content"/>
                 <TextView
                     android:layout_width="match_parent"
@@ -93,8 +91,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:paddingTop="24dp">
 
                 <ImageView
@@ -103,7 +99,7 @@
                     android:background="@drawable/ic_face_enroll_introduction_visibility">
                 </ImageView>
                 <Space
-                    android:layout_width="8dp"
+                    android:layout_width="24dp"
                     android:layout_height="wrap_content"/>
                 <TextView
                     android:layout_width="match_parent"
@@ -116,8 +112,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:paddingTop="24dp">
 
                 <ImageView
@@ -126,7 +120,7 @@
                     android:background="@drawable/ic_face_enroll_introduction_people">
                 </ImageView>
                 <Space
-                    android:layout_width="8dp"
+                    android:layout_width="24dp"
                     android:layout_height="wrap_content"/>
                 <TextView
                     android:layout_width="match_parent"
diff --git a/res/layout/magnification_video_preference.xml b/res/layout/magnification_video_preference.xml
index fe7f26f..ff7089c 100644
--- a/res/layout/magnification_video_preference.xml
+++ b/res/layout/magnification_video_preference.xml
@@ -16,7 +16,9 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:clipChildren="true"
+    android:clipToPadding="true">
 
     <ImageView
         android:id="@+id/video_background"
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 0fa5f9f..6dfc8a3 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -27,7 +27,9 @@
     <FrameLayout android:id="@+id/pinned_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:background="?android:attr/windowBackground"
+        android:elevation="1dp"
+        android:visibility="gone"/>
 
     <FrameLayout
         android:id="@android:id/list_container"
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 7216d76..f94d25d 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -19,6 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
     <Toolbar
         android:id="@+id/action_bar"
@@ -30,6 +31,5 @@
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:background="?android:attr/windowBackground" />
+        android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index c4c0af5..ea89006 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -22,23 +22,17 @@
               android:layout_height="match_parent"
               android:layout_width="match_parent">
 
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="0px"
-            android:layout_width="match_parent"
-            android:layout_weight="1">
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:theme="?attr/switchBarTheme"/>
 
-        <com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"
-                  android:layout_height="?android:attr/actionBarSize"
-                  android:layout_width="match_parent"
-                  android:theme="?attr/switchBarTheme" />
-
-        <FrameLayout
-                android:id="@+id/main_content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-    </LinearLayout>
+    <FrameLayout
+        android:id="@+id/main_content"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
     <RelativeLayout android:id="@+id/button_bar"
                     android:layout_height="wrap_content"
@@ -51,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:layout_alignParentStart="true"
-                android:text="@*android:string/back_button_label" />
+                android:text="@*android:string/back_button_label"/>
 
         <LinearLayout
                 android:orientation="horizontal"
@@ -64,13 +58,13 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="5dip"
                     android:text="@*android:string/skip_button_label"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
 
             <Button android:id="@+id/next_button"
                     android:layout_width="150dip"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dip"
-                    android:text="@*android:string/next_button_label" />
+                    android:text="@*android:string/next_button_label"/>
 
         </LinearLayout>
 
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 9364071..1fc95e7 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -43,21 +43,18 @@
                 android:layout_marginBottom="8dp"
                 style="?android:attr/progressBarStyleHorizontal"/>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                xmlns:app="http://schemas.android.com/apk/res-auto"
+            <FrameLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
                 <TextureView
                     android:id="@+id/preview_view"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    app:layout_constraintDimensionRatio="1:1"/>
+                    android:layout_height="@dimen/qrcode_preview_size"/>
                 <com.android.settings.wifi.qrcode.QrDecorateView
                     android:id="@+id/decorate_view"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    app:layout_constraintDimensionRatio="1:1"/>
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    android:layout_height="@dimen/qrcode_preview_size"/>
+            </FrameLayout>
 
             <TextView
                 android:id="@+id/error_message"
diff --git a/res/raw/bubbles.mp4 b/res/raw/bubbles.mp4
deleted file mode 100644
index c68ea57..0000000
--- a/res/raw/bubbles.mp4
+++ /dev/null
Binary files differ
diff --git a/res/raw/notification_interruption_model.mp4 b/res/raw/notification_interruption_model.mp4
index 5183afa..5f35606 100644
--- a/res/raw/notification_interruption_model.mp4
+++ b/res/raw/notification_interruption_model.mp4
Binary files differ
diff --git a/res/raw/gesture_swipe_up.mp4 b/res/raw/system_nav_2_button.mp4
similarity index 100%
rename from res/raw/gesture_swipe_up.mp4
rename to res/raw/system_nav_2_button.mp4
Binary files differ
diff --git a/res/raw/system_nav_3_button.mp4 b/res/raw/system_nav_3_button.mp4
new file mode 100644
index 0000000..86fb236
--- /dev/null
+++ b/res/raw/system_nav_3_button.mp4
Binary files differ
diff --git a/res/raw/system_nav_fully_gestural.mp4 b/res/raw/system_nav_fully_gestural.mp4
new file mode 100644
index 0000000..ae9c6d7
--- /dev/null
+++ b/res/raw/system_nav_fully_gestural.mp4
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 69a9926..05cb900 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gesig is bygevoeg"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tik om gesigstawing op te stel"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Gesigstawing"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Gebruik toeganklikheidopstelling"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gebruik jou gesig om jou foon te ontsluit, aankope te magtig, of by programme aan te meld."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gebruik jou gesig om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jy kan nie jou gesig gebruik om hierdie toestel te ontsluit nie. Kontak jou organisasie se administrateur vir meer inligting."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gebruik jou gesig om jou foon te ontsluit, aankope te magtig, of by programme aan te meld"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Sentreer jou gesig in die sirkel"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Doen dit later"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> gesigte byvoeg"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Groen-blou"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Geel"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Jy moet jou PIN bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Jy moet jou wagwoord bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> versoek tans volle beheer van hierdie toestel. Die diens kan die skerm lees en namens gebruikers met toeganklikheidsbehoeftes optree. Hierdie vlak van beheer is nie vir die meeste programme toepaslik nie."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"As jy op OK tik, sal <xliff:g id="SERVICE">%1$s</xliff:g> stop."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen dienste geïnstalleer nie"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Geen diens is gekies nie"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Dateer Moenie Steur Nie op"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Onderbreek kennisgewings om gefokus te bly"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hierdie kenmerk is nie op hierdie toestel beskikbaar nie"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Hierdie kenmerk is nie beskikbaar nie"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Dit sal hierdie foon stadiger maak"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Dwing vol GNSS-metings af"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spoor alle GNSS-konstellasies en -frekwensies na sonder enige dienssiklussering"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Laat agtergrondaktiwiteitafskoppe toe"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 05cc15a..d6ad2bf 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"መልክ ታክሏል"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"በመልክ ማረጋገጥን ለማቀናበር መታ ያድርጉ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"በመልክ ማረጋገጥ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"የተደራሽነት ቅንብርን ይጠቀሙ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት መልክዎን ይጠቀሙ።"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን ፊት ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት ፊትን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት መልክዎን ይጠቀሙ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ክቡ ውስጥ የእርስዎ ፊት መሃል ለመሃል ያድርጉት"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"በኋላ ላይ ያድርጉት"</string>
     <string name="face_add_max" msgid="4408683751143942949">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ ፊቶችን ማከል ይችላሉ"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ሳያን"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ቢጫ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ማጀንታ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"አንድ መተግበሪያ የፍቃድ ጥያቄ እያገደ ስለሆነ ቅንብሮች ጥያቄዎን ማረጋገጥ አይችሉም።"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ካበሩት፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ፒን ማረጋገጥ ያስፈልግዎታል።"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን የይለፍ ቃል ማረጋገጥ ያስፈልግዎታል።"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ሙሉ የዚህ መሣሪያ ቁጥጥር እየጠየቀ ነው። አገልግሎቱ የተደራሽነት ፍላጎቶች ያላቸውን ተጠቃሚዎች ወክሎ ማያ ገጹን ማንበብ እና ለእነሱ መስራት ይችላል። ይህ የቁጥጥር ደረጃ ለአብዛኛዎቹ መተግበሪያዎች አግባብ አይደለም።"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ይቁም?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"እሺን ነካ ማድረግ <xliff:g id="SERVICE">%1$s</xliff:g>ን ያስቆማል።"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ምንም አገልግሎት አልተመረጠም"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"አትረብሽን አዘምን"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ትኩረት እንደሰጡ ለመቆየት ማሳወቂያዎችን ባሉበት አቁም"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ይህ ባህሪ በዚህ መሣሪያ ላይ አይገኝም"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ይህ ባህሪ አይገኝም"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ይህን ስልክ ያዘገየዋል"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ሙሉ የGNSS መለኪያዎች አስገድድ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ሁሉንም የGNSS ህብረ ፎቶዎችን እና ድግምግሞሾችን ያለምንም የሥራ ብስክሌት ግልቢያ ዱካቸውን ይከታተሉ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"የበስተጀርባ እንቅስቃሴ ጅምሮችን ፍቀድ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4224b1e..117fdf2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -411,6 +411,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"تمت إضافة الوجه"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"انقر لإعداد المصادقة بالوجه"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"المصادقة بالوجه"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"استخدام إعداد إمكانية الوصول"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -421,7 +426,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"يمكنك استخدام وجهك لفتح الهاتف أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام وجهك لفتح هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"وضع الوجه في منتصف الدائرة"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"تنفيذ ذلك لاحقًا"</string>
     <string name="face_add_max" msgid="4408683751143942949">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> وجه."</string>
@@ -995,7 +1002,7 @@
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"‏تحديد نطاق AP"</string>
     <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"تلقائي"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"نطاق بتردد ٢٫٤ غيغاهرتز"</string>
-    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"نطاق بتردد 5.0 غيغاهرتز"</string>
+    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"نطاق بتردد ٥ غيغاهرتز"</string>
     <string name="wifi_ap_prefer_5G" msgid="2501070491623803139">"يفضّل نطاق بتردد 5.0 غيغاهرتز"</string>
     <string name="wifi_ap_2G" msgid="8378132945192979364">"٢٫٤ غيغاهرتز"</string>
     <string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 غيغاهرتز"</string>
@@ -2299,7 +2306,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"سماوي"</string>
     <string name="color_yellow" msgid="9112680561610873529">"أصفر"</string>
     <string name="color_magenta" msgid="5059212823607815549">"أرجواني"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
@@ -2308,8 +2316,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد كلمة المرور."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"تطلب خدمة <xliff:g id="SERVICE">%1$s</xliff:g> الحصول على تحكم كامل في هذا الجهاز. ويمكن للخدمة قراءة الشاشة والتصرف بالنيابة عن المستخدمين ذوي الاحتياجات المتعلقة بإمكانية الوصول. ولا يناسب هذا المستوى من التحكم معظم التطبيقات."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"يؤدي النقر على \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أي خدمات"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"لم يتم اختيار أي خدمة"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
@@ -4633,8 +4660,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"تحديث إعداد \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"إيقاف الإشعارات مؤقتًا للحفاظ على التركيز"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"لا تتوفر هذه الميزة على هذا الجهاز"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"هذه الميزة ليست متوفرة."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ستؤدي إلى إبطاء هذا الهاتف."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏فرض كامل لقياسات GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‏تتبّع جميع مجموعات وفترات تكرار GNSS التي لا تحتوي على دورات عمل"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"السماح ببدء الأنشطة في الخلفية"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 66269d8..0f0f737 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -398,6 +398,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"চেহেৰা যোগ কৰা হ\'ল"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"চেহেৰা প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ টিপক"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"চেহেৰা প্ৰমাণীকৰণ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"সাধ্য সুবিধা ছেট আপ ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -408,7 +413,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"নিজৰ ফ’ন আনলক কৰা, ক্ৰয়সমূহক স্বীকৃতি দিয়া বা এপসমূহত ছাইন ইন কৰা কাৰ্যৰ বাবে নিজৰ চেহেৰা ব্য়ৱহাৰ কৰক।"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ বা ক্ৰয়ৰ অনুমোদন জনাবলৈ আপোনাৰ মুখমণ্ডল ব্যৱহাৰ কৰক।\n\nটোকা: আপুনি এই ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ মুখমণ্ডল ব্যৱহাৰ কৰিব নোৱাৰে৷ অধিক তথ্যৰ বাবে আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"নিজৰ ফ’ন আনলক কৰা, ক্ৰয়সমূহক স্বীকৃতি দিয়া বা এপসমূহত ছাইন ইন কৰা কাৰ্যৰ বাবে নিজৰ চেহেৰা ব্য়ৱহাৰ কৰক"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"আপোনাৰ মুখমণ্ডলটো বৃত্তৰ ভিতৰলৈ আনক"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"এইটো পিছত কৰিব"</string>
     <string name="face_add_max" msgid="4408683751143942949">"আপুনি <xliff:g id="COUNT">%d</xliff:g>লৈকে মুখমণ্ডল যোগ কৰিব পাৰে"</string>
@@ -2186,7 +2193,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"চাইয়ান"</string>
     <string name="color_yellow" msgid="9112680561610873529">"হালধীয়া"</string>
     <string name="color_magenta" msgid="5059212823607815549">"মেজেণ্টা"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যৱহাৰ কৰিবনে?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>ক নিম্নোক্ত অনুমতিকেইটাৰ আৱশ্যক:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"যিহেতু এটা এপে অনুমতি বিচাৰি কৰা অনুৰোধ ঢাকি ধৰিছে, ছেটিংসমূহে আপোনাৰ উত্তৰ সত্যাপন কৰিব পৰা নাই।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"যদি আপুনি <xliff:g id="SERVICE">%1$s</xliff:g> অন কৰে, তেন্তে আপোনাৰ ডিভাইচটোৱে ডেটা এনক্ৰিপশ্বন বঢ়াবলৈ স্ক্ৰীণ লক ব্যৱহাৰ নকৰিব।"</string>
@@ -2195,8 +2203,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"যিহেতু <xliff:g id="SERVICE">%1$s</xliff:g> সক্ৰিয় কৰিলে ডেটা এনক্ৰিপশ্বনত প্ৰভাৱ পৰিব, গতিকে আপুনি আপোনাৰ পিনটো নিশ্চিত কৰিব লাগিব।"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"যিহেতু <xliff:g id="SERVICE">%1$s</xliff:g>ক সক্ৰিয় কৰিলে ডেটা এনক্ৰিপশ্বনত প্ৰভাৱ পৰিব, গতিকে আপুনি আপোনাৰ পাছৱৰ্ডটো নিশ্চিত কৰিব লাগিব।"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>এ এই ডিভাইচটোৰ সম্পূৰ্ণ নিয়ন্ত্ৰণ বিচাৰিছে। এই সেৱাটোৱে স্ক্ৰীণ পঢ়িব পাৰে আৰু ব্যৱহাৰকাৰীৰ হৈ সাধ্য সুবিধাৰ প্ৰয়োজন অনুসৰি কাম কৰিব পাৰে। বেছিভাগ এপৰ ক্ষেত্ৰত এই নিয়ন্ত্ৰণৰ স্তৰ সঠিক নহয়।"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> বন্ধ কৰিবনে?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ঠিক আছে-ত স্পৰ্শ কৰিলে <xliff:g id="SERVICE">%1$s</xliff:g> বন্ধ হ’ব।"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"কোনো সেৱা ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"কোনো সেৱা বাছনি কৰা হোৱা নাই"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"কোনো বিৱৰণ যোগান ধৰা হোৱা নাই।"</string>
@@ -4312,8 +4339,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"অসুবিধা নিদিব-ক আপডে’ট কৰক"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"মনোযোগ বৰ্তাই ৰাখিবলৈ জাননী বন্ধ কৰক"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"এই ডিভাইচটোত এই সুবিধাটো উপলব্ধ নহয়"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"এই সুবিধাটো উপলব্ধ নহয়"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ইয়ে এই ফ’নটো মন্থৰ কৰিব"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"নেপথ্যৰ কাৰ্যকলাপ আৰম্ভ কৰাত অনুমতি দিয়ে"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index db03aca..8927053 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Üz əlavə edildi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Üz identifikasiyası ayarlamaq üçün klikləyin"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Üz identifikasiyası"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Əlçatımlıq quraşdırması istifadə edin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefonu kiliddən çıxarmaq, satınalmaları doğrulamaq və ya tətbiqlərə daxil olmaq üçün üzünüzdən istifadə edin."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiq etmək üçün üzünüzdən istifadə edin.\n\nQeyd: Bu cihazı kiliddən çıxarmaq üçün üzünüzdən istifadə edə bilməzsiniz. Ətraflı məlumat üçün təşkilat admini ilə əlaqə saxlayın."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefonu kiliddən çıxarmaq, satınalmaları doğrulamaq və ya tətbiqlərə daxil olmaq üçün üzünüzdən istifadə edin"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Üzünüzü dairənin mərkəzində saxlayın"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Daha sonra edin"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maksimum <xliff:g id="COUNT">%d</xliff:g> üz əlavə edə bilərsiniz"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Mavi"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Sarı"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> xidməti istifadə edilsin?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> etməlidir:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Çünki, tətbiq icazə sorğusunu anlaşılmaz edir. Ayarlar cavabınızı doğrulaya bilməz."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktiv olarsa, cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün PIN kodunu təsdiq etməlisiniz."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün parolunuzu təsdiq etməlisiniz."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> bu cihaza tam nəzarət tələb edir. Xidmət ekranı oxuya və girişi olmayan istifadəçilərin əvəzinə əməliyyat icra edə bilər. Nəzarətin bu səviyyəsi əksər tətbiqlər üçün uyğun deyil."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> dayandırılsın?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"OK basmaqla <xliff:g id="SERVICE">%1$s</xliff:g> dayandırılacaq."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Heç bir xidmət quraşdırılmayıb"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Xidmət seçilmədi"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Heç bir təsvir verilməyib."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Narahat Etməyin\" rejimini yeniləyin"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Foksulanmağa davam etmək üçün bildirişləri dayandırın"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya artıq bu cihazda əlçatan deyil"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Bu funksiya əlçatan deyil"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Bu telefonun sürətini yavaşladacaq"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tam GNSS ölçülərini icra edin"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"İş sistemi olmadan bütün GNSS qruplaşmaları və tezliklərini izləyin"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Arxa fon fəaliyyətinin başlamasına icazə verin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c53dd91..da5b9ef 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice je dodato"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Dodirom podesite potvrdu identiteta licem"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Potvr. identit. licem"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Koristite podeš. za pristupačn."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Otključavajte telefon, odobravajte kupovine ili se prijavljujte u aplikacije pomoću lica."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Otključavajte telefon ili odobravajte kupovine pomoću lica.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću lica. Više informacija zatražite od administratora organizacije."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Otključavajte telefon, odobravajte kupovine ili se prijavljujte u aplikacije pomoću lica"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Postavite lice u centar kruga"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Uradiću to kasnije"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maksimalan broj lica koji možete da dodate je <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -959,7 +966,7 @@
     <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"Postavite QR kôd u nastavku da biste dodali uređaj na mrežu „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"Skeniraj QR kôd"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"Postavite QR kôd u nastavku da biste dodali uređaj na mrežu „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Pridružite se Wi‑Fi mreži tako što ćete skenirati QR kôd"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Povežite se na Wi‑Fi mrežu tako što ćete skenirati QR kôd"</string>
     <string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Deli Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skenirajte ovaj QR kôd da biste se povezali sa „<xliff:g id="SSID">%1$s</xliff:g>“ i delili lozinku"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skenirajte ovaj QR kôd da biste se pridružili mreži „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite lozinku."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> traži potpunu kontrolu nad ovim uređajem. Usluga može da čita sadržaj sa ekrana i da obavlja razne zadatke za korisnike usluga pristupačnosti. Ovaj nivo kontrole nije odgovarajući za većinu aplikacija."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li da zaustavite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ako dodirnete Potvrdi, zaustavićete <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nijedna usluga nije instalirana"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nijedna usluga nije izabrana"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije naveden opis."</string>
@@ -4068,7 +4095,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za potrošnju podataka"</string>
     <string name="data_usage_template" msgid="2923744765873163859">"Iskoristili ste <xliff:g id="ID_1">%1$s</xliff:g> u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurišite"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije uključene u upotrebu"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije koje su trošile podatke"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija ima dozvolu da koristi neograničenu količinu podataka kada je Ušteda podataka uključena</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije imaju dozvolu da koriste neograničenu količinu podataka kada je Ušteda podataka uključena</item>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte režim Ne uznemiravaj"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obaveštenja radi bolje koncentracije"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ova funkcija nije dostupna"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Usporiće ovaj telefon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Prinudno pokreni puna GNSS merenja"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve GNSS konstalacije i frekvencije bez ciklusa rada"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Dozvoli pokretanje aplikacija u pozadini"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 596b7d0..5c51dfd 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Твар дададзены"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Націсніце для наладкі распазнавання твару"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Распазнаванне твару"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Наладка спецыяльных магчымасцей"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі тэлефона, аўтарызацыі купляў і ўваходу ў праграмы."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца функцыяй распазнавання твару.\n\nЗаўвага. Вы не можаце выкарыстоўваць твар для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі тэлефона, аўтарызацыі купляў і ўваходу ў праграмы"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Размясціце твар у цэнтры круга"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Пазней"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Можна дадаць да <xliff:g id="COUNT">%d</xliff:g> твараў"</string>
@@ -2244,7 +2251,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Блакітны"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Жоўты"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурны"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
@@ -2253,8 +2261,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой PIN-код."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой пароль."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Праграма <xliff:g id="SERVICE">%1$s</xliff:g> запытвае поўны кантроль над гэтай прыладай. Яна можа чытаць змесціва экрана і дзейнічаць ад імя карыстальнікаў, якім патрабуюцца спецыяльныя магчымасці. Такі ўзровень доступу не прызначаны для большасці праграм."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Адключыць \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Каб адключыць \"<xliff:g id="SERVICE">%1$s</xliff:g>\", націсніце ОК."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Служба не выбрана"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</string>
@@ -4475,8 +4502,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Абнавіце рэжым \"Не турбаваць\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Прыпыніце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Гэта функцыя недаступная"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Праца гэтага тэлефона будзе запаволена"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Прымусова правесці поўныя вымярэнні GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Дазволіць фонавую актыўнасць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b76e9e3..a3fe0ec 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Добавено е лице"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Докоснете за настр. на удостов. с лице"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Удостоверяване с лице"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Настр. на ф-ята за достъпност: Ползване"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Използвайте лицето си за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Използвайте лицето си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с лицето си. За повече информация се свържете с администратора на организацията си."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Използвайте лицето си за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Центрирайте лицето си в кръга"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"По-късно"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> лица"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Синьозелен"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Жълт"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурен"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> изисква:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"От Настройки не може да се получи потвърждение за отговора ви, защото заявката за разрешение се прикрива от приложение."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако включите <xliff:g id="SERVICE">%1$s</xliff:g>, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите ПИН кода си."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите паролата си."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> иска пълен контрол над това устройство. Услугата може да чете екрана и да действа от името на потребителите с увреждания. Това ниво на контрол не е подходящо за повечето приложения."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Да се спре ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"С докосването на „OK“ ще спрете <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма инсталирани услуги"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Няма избрана услуга"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
@@ -3214,7 +3241,7 @@
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Виз. предупрежд.: Блокиране"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуални сигнали: Разрешаване"</string>
-    <string name="zen_mode_settings_category" msgid="8404473163624911791">"Когато режимът „Не ме безпокойте“ е включен"</string>
+    <string name="zen_mode_settings_category" msgid="8404473163624911791">"Когато режимът „Не безпокойте“ е включен"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="8138441771855063771">"Ограничаване на известията"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Без звук от известията"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ще виждате известия на екрана си"</string>
@@ -3235,7 +3262,7 @@
     <string name="zen_mode_block_effect_intent" msgid="350764335391428447">"Без включване на екрана"</string>
     <string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Без премигваща светлина"</string>
     <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Без изскачащи прозорци с известия на екрана"</string>
-    <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Скриване на иконите за лентата на състоянието в горната част на екрана"</string>
+    <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Скриване на иконите за състоянието горе в екрана"</string>
     <string name="zen_mode_block_effect_badge" msgid="214553506070597320">"Скриване на точките за известия в иконите на приложенията"</string>
     <string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"Без „събуждане“ при известия"</string>
     <string name="zen_mode_block_effect_list" msgid="4722887783222298295">"Скриване от падащия панел"</string>
@@ -3279,7 +3306,7 @@
     <string name="zen_category_exceptions" msgid="7601136604273265629">"Изключения"</string>
     <string name="zen_category_schedule" msgid="9000447592251450453">"График"</string>
     <string name="zen_sound_title" msgid="4461494611692749446">"Вижте всички изключения"</string>
-    <string name="zen_sound_footer" msgid="7621745273287208979">"Когато режимът „Не ме безпокойте“ е включен, звуците и вибрирането ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе."</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Когато режимът „Не безпокойте“ е включен, звуците и вибрирането ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе."</string>
     <string name="zen_sound_category_title" msgid="4336596939661729188">"Спиране на звука за всичко освен за"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Звукът е спрян"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Звукък не е спрян"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Актуализиране на режима „Не безпокойте“"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Поставете известията на пауза, за да не ви разсейват"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Тази функция не е налице на устройството"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Тази функция не е налице"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Тя ще забави телефона ви"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Налагане на пълно проследяване на измерванията с GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Проследяване на всички констелации и честоти на GNSS без използване на коефициент на запълване"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Разрешаване на стартирания на активност на заден план"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 91355c6..0d99a94 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ফেস যোগ করা হয়েছে"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ফেস যাচাইকরণ সেট-আপ করতে ট্যাপ করুন"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ফেস যাচাইকরণ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"অ্যাক্সেসিবিলিটি সেট-আপ ব্যবহার"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"আপনার ফোন আনলক, কেনাকাটা অনুমোদন বা অ্যাপগুলিতে সাইন-ইন করতে আপনার ফেস ব্যবহার করুন।"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার ফেস ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার ফেস ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের অ্যাডমিনের সাথে যোগাযোগ করুন।"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"আপনার ফোন আনলক, কেনাকাটা অনুমোদন বা অ্যাপগুলিতে সাইন-ইন করতে আপনার ফেস ব্যবহার করুন"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"বৃত্তের মাঝে আপনার ফেসটি আনুন"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"এটি পরে করুন"</string>
     <string name="face_add_max" msgid="4408683751143942949">"আপনি <xliff:g id="COUNT">%d</xliff:g>টি পর্যন্ত ফেস যোগ করতে পারেন"</string>
@@ -1575,7 +1582,7 @@
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ফিল্ড ২ অথবা ৩ সংখ্যার হতে হবে।"</string>
     <string name="error_adding_apn_type" msgid="4181334016628549645">"পরিষেবা প্রদানকারী %s এর মতো APN যোগ করার অনুমতি দেয়নি।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ডিফল্ট APN সেটিংস পুনরুদ্ধার করা হচ্ছে।"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে আবার সেট করুন"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে রিসেট করুন"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ডিফল্ট APN সেটিংস আবার সেট করা সম্পন্ন হয়েছে।"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"রিসেটের বিকল্পগুলি"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"নেটওয়ার্ক, অ্যাপ, অথবা ডিভাইস রিসেট করা যায়"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"নীলাভ রঙ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"হলুদ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"রাণী রঙ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> কে এটি করতে হবে:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"একটি অ্যাপ্লিকেশান কোনো অনুমোদনের অনুরোধকে অস্পষ্ট করছে, তাই সেটিংস আপনার প্রতিক্রিয়া যাচাই করতে পারেনি৷"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"আপনি যদি <xliff:g id="SERVICE">%1$s</xliff:g> চালু করেন, তাহলে ডেটা এনক্রিপশন উন্নত করতে আপনার ডিভাইস আপনার স্ক্রিন লক ব্যবহার করবে না৷"</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার পিন নিশ্চিত করতে হবে।"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার পাসওয়ার্ড নিশ্চিত করতে হবে।"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"এই ডিভাইসের সম্পূর্ণ নিয়ন্ত্রণ পেতে <xliff:g id="SERVICE">%1$s</xliff:g>-এর তরফে অনুরোধ জানানো হচ্ছে। পরিষেবাটি স্ক্রিন পড়তে পারে এবং ব্যবহারকারীর পক্ষ থেকে অ্যাক্সেসিবিলিটির প্রয়োজন অুযায়ী কাজ করতে পারে। বেশিরভাগ অ্যাপের জন্যই লেভেলের নিয়ন্ত্রণ ঠিক নয়।"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> থামাবেন?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"\'ঠিক আছে\' বোতামে ট্যাপ করলে <xliff:g id="SERVICE">%1$s</xliff:g> থেমে যাবে।"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"কোনো সার্ভিস বেছে নেওয়া হয়নি"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"কোনো বিবরণ প্রদান করা নেই।"</string>
@@ -2542,11 +2569,11 @@
     <string name="credentials_reset" msgid="3239382277144980418">"ক্রেডেনশিয়াল সাফ করুন"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"সব সার্টিফিকেট সরান"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"বিশ্বস্ত ক্রেডেনশিয়াল"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"বিশ্বস্ত CA শংসাপত্রগুলি প্রদর্শন করুন"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"বিশ্বস্ত CA সার্টিফিকেট প্রদর্শন করুন"</string>
     <string name="user_credentials" msgid="3719013347787187083">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"উন্নত"</string>
-    <string name="credential_storage_type" msgid="8629968543494001364">"সঞ্চয়স্থানের প্রকার"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"স্টোরেজের প্রকার"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"হার্ডওয়্যার-ব্যাকড"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"শুধুমাত্র সফ্টওয়্যার"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
@@ -2731,7 +2758,7 @@
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ডেটা ব্যবহারের সীমা সেট করুন"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ডেটার ব্যবহার সীমিত করা"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোনের করা ডেটা ব্যবহারের হিসাব এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই এমনভাবে সীমা সেট করুন যাতে অপেক্ষাকৃত কম মোবাইল ডেটা খরচ হয়।"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধ করবেন?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে কানেক্ট না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে কানেক্ট না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'বিরক্ত করবেন না\' মোডটি আপডেট করুন"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি পজ করুন"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"এই ফিচারটি উপলভ্য নেই"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"এই ফিচারটি ব্যবহার করলে ফোন ঠিকভাবে কাজ নাও করতে পারে"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GnssMeasurement সম্পূর্ণভাবে ট্র্যাক করুন"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ডিউটি-সাইক্লিং বাদে সমস্ত কন্সটেলেশন এবং ফ্রিকোয়েন্সি ট্র্যাক করুন"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি চালু করার অনুমতি দিন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 42a15c9..50808a5 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice je dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Dodirnite da postavite autentifikaciju licem"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autentifikacija licem"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Koristi postavku za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Koristite lice za otključavanje telefona, odobravanje kupovine ili prijavu u aplikacije."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Koristite lice za otključavanje telefona ili odobravanje kupovina.\n\nNapomena: ne možete koristiti lice za otključavanje ovog uređaja. Za više informacija obratite se administratoru svoje organizacije."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Koristite lice za otključavanje telefona, odobravanje kupovine ili prijavu u aplikacije."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Namjestite lice u centar kruga"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Uradit ću to kasnije"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Možete dodati najviše <xliff:g id="COUNT">%d</xliff:g> lica"</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Koristiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacija nije dala odobrenje za zahtjev pa postavke ne mogu potvrditi vaš odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukoliko uključite uslugu <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite lozinku."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> zahtijeva potpunu kontrolu ovog uređaja. Usluga može čitati sadržaj ekrana i djelovati u ime korisnika s potrebama za pristupačnost. Ovaj nivo kontrole nije prikladan za većinu aplikacija."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Uslugu <xliff:g id="SERVICE">%1$s</xliff:g> možete zaustaviti dodirom na \"Uredu\"."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nije odabrana usluga"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije naveden opis."</string>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte način rada Ne ometaj"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavještenja da ostanete fokusirani"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ova funkcija nije dostupna"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ona će usporiti ovaj telefon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Prisilno omogući potpuno GNSS mjerenje"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Praćenje svih konstelacija i frekvencija GNSS-a bez ciklusa rada"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Dozvoli pokretanja aktivnosti u pozadini"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e99d93f..058e2d9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Cara afegida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toca per configurar l\'autenticació facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticació facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Utilitza la config. d\'accessibilitat"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Fes servir la cara per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilitza la cara per desbloquejar el telèfon o aprovar compres.\n\nNota: no pots fer servir la cara per desbloquejar aquest dispositiu. Per obtenir més informació, contacta amb l\'administrador de la teva organització."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Fes servir la cara per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra la cara dins del cercle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fes-ho més tard"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Pots afegir fins a <xliff:g id="COUNT">%d</xliff:g> cares"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Groc"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Com que hi ha una aplicació que oculta una sol·licitud de permís, no es pot verificar la teva resposta des de la configuració."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si actives <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Cal que confirmis el PIN perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Cal que confirmis la contrasenya perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> sol·licita un control total del dispositiu. El servei pot llegir la pantalla i actuar en nom dels usuaris amb necessitats d\'accessibilitat. Aquest nivell de control no és adequat per a la majoria d\'aplicacions."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vols aturar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Si toques D\'acord, s\'aturarà <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No hi ha cap servei instal·lat"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No s\'ha seleccionat cap servei"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
@@ -3616,7 +3643,7 @@
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="restricted_true_label" msgid="4761453839409220473">"Restringida"</string>
-    <string name="restricted_false_label" msgid="3279282180297058755">"L\'aplicació pot consumir bateria en segon pla"</string>
+    <string name="restricted_false_label" msgid="3279282180297058755">"L\'aplicació pot utilitzar bateria en segon pla"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vols demanar el PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vols demanar el patró?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Sol·licitar contrasenya?"</string>
@@ -3765,7 +3792,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Aquest informe d\'errors s\'està compartint amb l\'administrador de TI. Contacta-hi per obtenir-ne més informació."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Comparteix"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rebutja"</string>
-    <string name="usb_use_charging_only" msgid="4800495064747543954">"Cap transferència de dades"</string>
+    <string name="usb_use_charging_only" msgid="4800495064747543954">"Sense transferència de dades"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Carrega només aquest dispositiu"</string>
     <string name="usb_use_power_only" msgid="3236391691786786070">"Carrega el dispositiu connectat"</string>
     <string name="usb_use_file_transfers" msgid="1223134119354320726">"Transferència de fitxers"</string>
@@ -3947,7 +3974,7 @@
     <string name="condition_device_vibrate_summary" msgid="5743200564646910423">"Per a trucades i notificacions"</string>
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"Configura el programa de Llum nocturna"</string>
     <string name="night_display_suggestion_summary" msgid="228346372178218442">"Canvia automàticament el color de la pantalla cada nit"</string>
-    <string name="condition_night_display_title" msgid="5599814941976856183">"Opció Llum nocturna activada"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"Llum nocturna activada"</string>
     <string name="condition_night_display_summary" msgid="7150932917610919907">"La pantalla té una tonalitat ambre"</string>
     <string name="condition_grayscale_title" msgid="3426050703427823519">"Escala de grisos"</string>
     <string name="condition_grayscale_summary" msgid="7652835784223724625">"Mostra només en color gris"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualitza el mode No molestis"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Posa en pausa les notificacions per centrar l\'atenció"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Aquesta funció no està disponible en aquest dispositiu"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Aquesta funció no està disponible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Aquesta funció alentirà el telèfon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Força mesuraments de GNSS complets"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Fes un seguiment de totes les freqüències i constel·lacions de GNSS sense cicle de treball"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permet l\'inici d\'activitats en segon pla"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 05920da..1fc6732 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Obličej přidán"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Klepnutím nastavíte ověřování obličejem"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Ověřování obličejem"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Použít nastavení přístupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odemykejte telefon a schvalujte nákupy pomocí obličeje.\n\nPoznámka: Obličej nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Umístěte obličej do středu kruhu"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Později"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maximální počet obličejů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Tyrkysová"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Žlutá"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Žádost o oprávnění je blokována jinou aplikací. Nastavení proto vaši odpověď nemůže ověřit."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Pokud zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, zařízení nebude používat zámek obrazovky k vylepšení šifrování dat."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili svůj kód PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své heslo."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> požaduje plnou kontrolu nad zařízením. Služba může číst obrazovku a vykonávat akce namísto uživatelů, kteří potřebují usnadnění přístupu. Tato úroveň kontroly není u většiny aplikací vhodná."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vypnout funkci <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Klepnutím na tlačítko OK službu <xliff:g id="SERVICE">%1$s</xliff:g> ukončíte."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Žádná služba není nainstalována"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Není vybrána žádná služba"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizujte režim Nerušit"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pokud nechcete být rušeni, oznámení pozastavte"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Funkce v tomto zařízení není k dispozici"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Tato funkce není k dispozici"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Bude zpomalovat telefon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vynutit úplné měření GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sledovat všechny konstelace a frekvence GNSS bez cyklického vypínání a zapínání"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Povolit zahájení aktivity na pozadí"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5967c9c..4504b19 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansigtet blev tilføjet"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tryk for at konfigurere ansigtsgodk."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Ansigtsgodkendelse"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Brug hjælpefunktioner"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Brug dit ansigt til at låse din telefon op, godkende køb og logge ind i apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Lås din telefon op eller godkend køb ved hjælp af dit ansigt.\n\nBemærk! Du kan ikke bruge dit ansigt til at låse denne enhed op. Kontakt administratoren for din organisation for at få flere oplysninger."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Brug dit ansigt til at låse din telefon op, godkende køb og logge ind i apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrer dit ansigt i cirklen"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gør det senere"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> ansigter"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Grønblå"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Lyslilla"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du aktiverer <xliff:g id="SERVICE">%1$s</xliff:g>, vil enheden ikke benytte skærmlåsen til at forbedre datakrypteringen."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte din pinkode."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte din adgangskode."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> anmoder om fuld kontrol over denne enhed. Tjenesten kan læse skærmen og handle på vegne af brugere med særlige behov. Dette kontrolomfang er ikke passende for de fleste apps."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vil du standse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Når du trykker på OK, standses <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Der er ikke installeret nogen tjenester"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Der er ikke valgt nogen tjeneste"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Opdater Forstyr ikke"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sæt notifikationer på pause, så du kan koncentrere dig"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funktion er ikke tilgængelig på denne enhed"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Denne funktion er ikke tilgængelig"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Den gør din telefon langsommere"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Gennemtving fuld GNSS-måling"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Tillad opstart af aktiviteter i baggrunden"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 69c204b..638f0f2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -380,7 +380,7 @@
     <string name="location_settings_loading_app_permission_stats" msgid="8523775367089431611">"Wird geladen…"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Verschlüsselung &amp; Anmeldedaten"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Verschlüsselung und Anmeldedaten"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone verschlüsselt"</string>
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Smartphone nicht verschlüsselt"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Gerät verschlüsselt"</string>
@@ -398,6 +398,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gesicht hinzugefügt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tippen, um Gesichtserkennung einzurichten"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Gesichtserkennung"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Bedienungshilfen-Einrichtung verwenden"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -408,7 +413,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Verwende die Gesichtserkennung, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Du kannst die Gesichtserkennung verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dieses Gerät kannst du nicht per Gesichtserkennung entsperren. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Verwende die Gesichtserkennung, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Gesicht in den Kreis halten"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Später"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Gesichter hinzufügen"</string>
@@ -425,12 +432,12 @@
     <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App-Anmeldung &amp; Zahlungen"</string>
     <string name="security_settings_face_settings_require_category" msgid="2643852178287575557">"Für Face Unlock erforderlich"</string>
     <string name="security_settings_face_settings_require_attention" msgid="1891157027896989860">"Augen auf Bildschirm gerichtet"</string>
-    <string name="security_settings_face_settings_require_attention_details" msgid="6063278991544881786">"Zum Entsperren des Smartphones musst du auf den Bildschirm blicken"</string>
+    <string name="security_settings_face_settings_require_attention_details" msgid="6063278991544881786">"Zum Entsperren musst du mit offenen Augen auf den Bildschirm blicken"</string>
     <string name="security_settings_face_settings_require_confirmation" msgid="3555852478589689141">"Schaltfläche zum Bestätigen"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="7965662696468917986">"Bei Authentifizierung für Apps immer Bestätigung anfordern"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"Gesichtsdaten löschen"</string>
     <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"Face Unlock neu einrichten"</string>
-    <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"Du kannst Face Unlock verwenden, um dein Gerät zu entsperren, dich in Apps anzumelden und Zahlungen zu bestätigen.\n\nDenk aber daran:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, während deine Augen geöffnet sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise deinem Kind oder deinem eineiigen Zwilling."</string>
+    <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, während deine Augen geöffnet sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise deinem Kind oder deinem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Gesichtsdaten löschen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="2609671025686003946">"Mit Face Unlock aufgezeichnete Daten werden dauerhaft und sicher gelöscht. Nach dem Entfernen benötigst du deine PIN, dein Muster oder dein Passwort zum Entsperren deines Smartphones, zum Anmelden bei Apps und zum Bestätigen von Zahlungen."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerabdruck"</string>
@@ -480,12 +487,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Später"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Fingerabdruck-Einrichtung überspringen?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du hast festgelegt, dass du unter anderem deinen Fingerabdruck zum Entsperren deines Smartphones verwenden möchtest. Wenn du diesen Schritt jetzt überspringst, musst du die Einrichtung zu einem späteren Zeitpunkt vornehmen. Die Einrichtung dauert nur ca. eine Minute."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7914950545902198894">"Mit der Displaysperre kannst du dein Tablet schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="2300047476104528001">"Mit der Displaysperre kannst du dein Gerät schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="5823994499768751994">"Mit der Displaysperre kannst du dein Smartphone schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="4490601819500843860">"Mit der Displaysperre kannst du dein Tablet schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="3741624920522374098">"Mit der Displaysperre kannst du dein Gerät schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="3523360900206227082">"Mit der Displaysperre kannst du dein Smartphone schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7914950545902198894">"Mit der Displaysperre kannst du dein Tablet schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="2300047476104528001">"Mit der Displaysperre kannst du dein Gerät schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="5823994499768751994">"Mit der Displaysperre kannst du dein Smartphone schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Authentifizierung per Fingerabdruck erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="4490601819500843860">"Mit der Displaysperre kannst du dein Tablet schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="3741624920522374098">"Mit der Displaysperre kannst du dein Gerät schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="3523360900206227082">"Mit der Displaysperre kannst du dein Smartphone schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\" und lege dann eine PIN, ein Muster oder ein Passwort fest."</string>
     <string name="lock_screen_pin_skip_title" msgid="8064328201816780457">"PIN-Einrichtung überspringen?"</string>
     <string name="lock_screen_password_skip_title" msgid="4155009417576409182">"Passworteinrichtung überspringen?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="6467327818577283960">"Mustereinrichtung überspringen?"</string>
@@ -862,7 +869,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"Nur Netzwerke mit stabiler Internetverbindung verwenden"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Automatisch mit offenen WLANs verbinden"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatisch mit leistungsstarken öffentlichen Netzwerken verbinden"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Wenn dein Gerät leistungsstarke öffentliche Netzwerke findet, verbindet es sich automatisch"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Für diese Funktion musst du zuerst einen Anbieter von Netzwerkbewertungen auswählen"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Für diese Funktion musst du zuerst einen kompatiblen Anbieter von Netzwerkbewertungen auswählen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
@@ -943,7 +950,7 @@
     <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"Wenn du das Gerät zu \"<xliff:g id="SSID">%1$s</xliff:g>\" hinzufügen möchtest, scanne den QR-Code unten"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"QR-Code scannen"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"Wenn du eine Verbindung zu \"<xliff:g id="SSID">%1$s</xliff:g>\" herstellen möchtest, scanne den QR-Code unten"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"WLAN durch Scannen eines QR-Codes beitreten"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Scanne den QR-Code, um dein Gerät mit dem WLAN zu verbinden"</string>
     <string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"WLAN teilen"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scanne diesen QR-Code, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen und das Passwort zu teilen"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Diesen QR-Code scannen, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen"</string>
@@ -1027,8 +1034,8 @@
       <item quantity="one">1 Abo</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="2504425359919617586">
-      <item quantity="other">%d Netzwerke &amp;amp Abos</item>
-      <item quantity="one">1 Netzwerk &amp; Abo</item>
+      <item quantity="other">%d Netzwerke und Abos</item>
+      <item quantity="one">1 Netzwerk und Abo</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Erweiterte WLAN-Einstellungen"</string>
     <string name="wifi_advanced_ssid_title" msgid="1552309166043760291">"SSID"</string>
@@ -1294,7 +1301,7 @@
     <string name="sim_reenter_new" msgid="6523819386793546888">"Neue PIN erneut eingeben"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN für SIM-Karte"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Falsche PIN"</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"Die PINs stimmen nicht überein."</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"Die PINs stimmen nicht überein"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"PIN kann nicht geändert werden.\nEventuell ist es die falsche PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN erfolgreich geändert"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"Status der SIM-Kartensperrung kann nicht geändert werden.\nMöglicherweise falsche PIN."</string>
@@ -1629,8 +1636,8 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tethering oder Verwendung von mobilen Hotspots nicht möglich, während der Datensparmodus aktiviert ist"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-Tethering"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"Internetverbindung des Smartphones über USB freigegeben"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"Internetverbindung des Tablets über USB freigegeben"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"Internetverbindung des Smartphones wird über USB freigegeben"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"Internetverbindung des Tablets wird über USB freigegeben"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-Tethering"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"Internetverbindung des Tablets über Bluetooth freigeben"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"Internetverbindung des Smartphones über Bluetooth freigeben"</string>
@@ -1727,7 +1734,7 @@
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN noch einmal eingeben"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Die Passwörter stimmen nicht überein."</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Die PINs stimmen nicht überein."</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Die PINs stimmen nicht überein"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"Muster noch einmal zeichnen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Sperre einrichten"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
@@ -1845,7 +1852,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"Beim Start fragen"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"App skalieren"</string>
     <string name="unknown" msgid="1592123443519355854">"Unbekannt"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Nach Namen sortieren"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Nach Name sortieren"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
     <string name="sort_order_recent_notification" msgid="6064103501358974282">"Letzte"</string>
     <string name="sort_order_frequent_notification" msgid="1733204081305830670">"Häufigste"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Blaugrün"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Gelb"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du deine PIN bestätigen."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Passwort bestätigen."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> fordert eine volle Kontrolle für dieses Gerät an. Der Dienst kann den Bildschirm lesen und im Namen von Nutzern mit Bedarf an Bedienungshilfen handeln. Dieses Maß an Kontrolle ist für die meisten Apps ungeeignet."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> beenden?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tippe auf \"Ok\", um <xliff:g id="SERVICE">%1$s</xliff:g> zu beenden."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Keine Dienste installiert"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Kein Dienst ausgewählt"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
@@ -2327,9 +2354,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Diese App läuft im Hintergrund und beansprucht dabei den Akku. Er könnte deshalb früher als erwartet leer sein."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Entfernen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Abbrechen"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akku-Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Apps automatisch verwalten"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Akkunutzung für selten verwendete Apps einschränken"</string>
@@ -2459,14 +2486,14 @@
     <string name="battery_saver" msgid="8172485772238572153">"Energiesparmodus"</string>
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"Automatisch aktivieren"</string>
     <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"Keine Aktivierung nach Zeitplan"</string>
-    <string name="battery_saver_auto_routine" msgid="8076053160450346731">"Anhand deines Routineverhaltens"</string>
-    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Nach Ladestand"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"Der Energiesparmodus wird automatisch aktiviert, wenn offenbar wird, dass der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines typischen Aufladezeitpunkts)."</string>
+    <string name="battery_saver_auto_routine" msgid="8076053160450346731">"Anhand deiner üblichen Abläufe"</string>
+    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Anhand des Ladestands"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"Der Energiesparmodus wird automatisch aktiviert, wenn offenbar wird, dass der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines üblichen Aufladezeitpunkts)."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"Wird bei <xliff:g id="PERCENT">%1$s</xliff:g> aktiviert"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Zeitplan festlegen"</string>
     <string name="battery_saver_turn_on_summary" msgid="5552800757174173459">"Akkulaufzeit verlängern"</string>
     <string name="battery_saver_sticky_title_new" msgid="613272902035943099">"Bei vollem Akku ausschalten"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"Der Energiesparmodus wird deaktiviert, wenn dein Smartphoneakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"Der Energiesparmodus wird deaktiviert, sobald dein Smartphone wieder zu <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6537930800784858686">"Der Energiesparmodus wird deaktiviert, wenn dein Tabletakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="8309483774864505603">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
     <!-- no translation found for battery_saver_seekbar_title (3795833548145424276) -->
@@ -2666,7 +2693,7 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles auswählen"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
-    <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile Daten &amp; WLAN"</string>
+    <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile Daten und WLAN"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"App-Nutzung"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"Informationen zur App"</string>
@@ -2725,14 +2752,14 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wenn du im Web Änderungen an deinen Konten vornimmst, werden diese automatisch auf dein Telefon kopiert.\n\nIm Gegenzug werden bei manchen Konten automatisch alle Änderungen, die auf dem Telefon vorgenommen wurden, ins Web kopiert. Dazu gehören auch Google-Konten."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Automatische Synchronisierung deaktivieren?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"So reduzierst du den Datenverbrauch und schonst den Akku, musst jedoch jedes einzelne Konto manuell synchronisieren, um neue Informationen abzurufen. Außerdem erhältst du keine Benachrichtigungen, wenn Aktualisierungen erfolgen."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung des Nutzungszyklus"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum (monatlich):"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tag für Zurücksetzung des Nutzungszyklus"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Jeden Monat zurücksetzen am:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Übernehmen"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Warnung für Datenverbrauch festlegen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit festlegen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datennutzung begrenzen"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Mobile Daten werden deaktiviert, sobald das von dir festgelegte Limit erreicht wurde.\n\nDer dabei angesetzte Wert wird von deinem Tablet berechnet und kann von der Messung des genutzten Datenvolumens durch deinen Mobilfunkanbieter abweichen. Daher empfiehlt es sich, einen eher eher etwas niedrigeren Limitwert anzugeben."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Mobile Daten werden deaktiviert, sobald das von dir festgelegte Limit erreicht wurde.\n\nDer dabei angesetzte Wert wird von deinem Smartphone berechnet und kann von der Messung des genutzten Datenvolumens durch deinen Mobilfunkanbieter abweichen. Daher empfiehlt es sich, einen eher eher etwas niedrigeren Limitwert anzugeben."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Mobile Daten werden deaktiviert, sobald das von dir festgelegte Limit erreicht wurde.\n\nDer dabei angesetzte Wert wird von deinem Tablet berechnet und kann von der Messung des genutzten Datenvolumens durch deinen Mobilfunkanbieter abweichen. Daher empfiehlt es sich, einen eher etwas niedrigeren Limitwert anzugeben."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Mobile Daten werden deaktiviert, sobald das von dir festgelegte Limit erreicht wurde.\n\nDer dabei angesetzte Wert wird von deinem Smartphone berechnet und kann von der Messung des genutzten Datenvolumens durch deinen Mobilfunkanbieter abweichen. Daher empfiehlt es sich, einen eher etwas niedrigeren Limitwert anzugeben."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Wenn du die mobilen Hintergrunddaten einschränkst, funktionieren einige Apps und Dienste nur bei einer aktiven WLAN-Verbindung."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Wenn du die mobilen Hintergrunddaten einschränkst, funktionieren einige Apps und Dienste nur bei einer aktiven WLAN-Verbindung.\n\nDiese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
@@ -2777,7 +2804,7 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(nicht verwendet)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(Server nicht überprüfen)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(vom Server erhalten)"</string>
-    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Dieser VPN-Typ kann nicht durchgehend verbunden sein"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Dieser VPN-Typ kann nicht durchgehend verbunden bleiben"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Durchgehend aktives VPN unterstützt numerische Serveradressen"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"Ein DNS-Server muss für durchgehend aktives VPN angegeben werden"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"DNS-Serveradressen müssen für durchgehend aktives VPN numerisch sein"</string>
@@ -3737,7 +3764,7 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akku-Optimierung"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung anzeigen"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> Apps funktionieren nicht wie gewohnt</item>
@@ -3983,7 +4010,7 @@
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobile Daten"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> WLAN-Datennutzung"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> Ethernet-Datennutzung"</string>
-    <string name="billing_cycle" msgid="6614597736285325497">"Datenwarnung &amp; -limit"</string>
+    <string name="billing_cycle" msgid="6614597736285325497">"Datenwarnung und -limit"</string>
     <string name="app_usage_cycle" msgid="8877223251648092131">"App-Datenverbrauchszyklus"</string>
     <string name="cell_data_warning" msgid="1985956818884847057">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="1578367585799358854">"Datenlimit: <xliff:g id="ID_1">^1</xliff:g>"</string>
@@ -3998,7 +4025,7 @@
     <string name="data_used_template" msgid="3245919669966296505">"Verbrauchte Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Datenwarnung festlegen"</string>
     <string name="data_warning" msgid="209133958008062117">"Warnlimit für mobile Daten"</string>
-    <string name="data_warning_footnote" msgid="776341964125603711">"Das Warnlimit für mobile Datennutzung und das Datenlimit werden vom Gerät berechnet und können von den Angaben des Mobilfunkanbieters abweichen."</string>
+    <string name="data_warning_footnote" msgid="776341964125603711">"Die Berechnung, wann das Warnlimit für die Nutzung mobiler Daten und das Datenlimit erreicht sind, erfolgt durch das Gerät. Die Nutzungsangaben des Mobilfunkanbieters können abweichen."</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datenlimit festlegen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>
     <string name="data_usage_template" msgid="2923744765873163859">"Datennutzung im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4315,8 +4342,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Bitte nicht stören\" aktualisieren"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Zur besseren Konzentration Benachrichtigungen pausieren"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Diese Funktion ist auf diesem Gerät nicht verfügbar"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Diese Funktion ist nicht verfügbar"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Sie würde dieses Smartphone langsamer machen"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vollständige GNSS-Messung erzwingen"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Alle GNSS-Konstellationen und -Frequenzen ohne GNSS-Zyklus erfassen"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Start von Hintergrundaktivitäten zulassen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8a458c1..3bd8a15 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Προστέθηκε πρόσωπο"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Πατήστε για ρύθμ. ελέγχου ταυτότ. προσ."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Έλεγχος ταυτότ. προσ."</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Χρήση ρύθμισης προσβασιμότητας"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Χρησιμοποιήστε το πρόσωπό σας για να ξεκλειδώνετε το τηλέφωνό σας, να εξουσιοδοτείτε αγορές ή να συνδέεστε σε εφαρμογές."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Χρησιμοποιήστε το πρόσωπό σας, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το πρόσωπό σας για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Χρησιμοποιήστε το πρόσωπό σας για να ξεκλειδώνετε το τηλέφωνό σας, να εξουσιοδοτείτε αγορές ή να συνδέεστε σε εφαρμογές"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Κεντράρετε το πρόσωπό σας στον κύκλο"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Αργότερα"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> πρόσωπα"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Κυανό"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Κίτρινο"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Πορφυρό"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> απαιτεί τα εξής:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Εάν ενεργοποιήσετε την υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε τον κωδικό σας PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε τον κωδικό πρόσβασής σας."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> ζητάει πλήρη έλεγχο αυτής της συσκευής. Η υπηρεσία μπορεί να διαβάσει την οθόνη και να δράσει εκ μέρους των χρηστών με προβλήματα προσβασιμότητας. Αυτό το επίπεδο ελέγχου δεν είναι κατάλληλο για τις περισσότερες εφαρμογές."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Διακοπή <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Πατήστε το \"OK\", για να διακοπεί η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Δεν έχει επιλεγεί κάποια υπηρεσία"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ενημέρωση λειτουργίας \"Μην ενοχλείτε\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Θέστε σε παύση τις ειδοποιήσεις για να παραμένετε συγκεντρωμένοι"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Αυτή η λειτουργία δεν είναι διαθέσιμη σε αυτήν τη συσκευή"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Αυτή η λειτουργία δεν είναι διαθέσιμη"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Θα επιβραδύνει αυτό το τηλέφωνο"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Αναγκαστικές πλήρεις μετρήσεις GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Παρακολούθηση όλων των πανοραμικών συνθέσεων και των συχνοτήτων GNSS χωρίς κύκλο λειτουργιών"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Να επιτρέπεται η έναρξη δραστηριοτήτων στο παρασκήνιο"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1226467..4d0e99e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -399,6 +399,9 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap to set up face authentication"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Face authentication"</string>
+    <string name="security_settings_face_enroll_education_title" msgid="2695443729648587731">"How to set up Face Unlock"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="4697363240703556987">"Use your face to authenticate"</string>
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +412,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
     <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
@@ -2187,7 +2192,7 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="1374048678465697350">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full contol of your device?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
@@ -2196,8 +2201,17 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
+    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
+    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"View and control screen"</string>
+    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"It can read all content on the screen and display content over other apps."</string>
+    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"View and platform actions"</string>
+    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"It can track your interactions with an app or a hardware sensor, and interact with apps on your behalf."</string>
+    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"Allow"</string>
+    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"Deny"</string>
+    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"Stop"</string>
+    <string name="accessibility_dialog_button_cancel" msgid="5006357240387387028">"Cancel"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tapping OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="4593387199926310801">"Tapping <xliff:g id="STOP">%1$s</xliff:g> will stop <xliff:g id="SERVICE">%2$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No service selected"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
@@ -4313,8 +4327,8 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"This feature is not available"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"It will slow down this phone"</string>
+    <string name="disabled_feature" msgid="3232554901854971743">"Feature not available"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="3557117039415422481">"This feature has been turned off because it slows down your phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Allow background activity starts"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 1c0420c..1c1ab50 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -399,6 +399,9 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap to set up face authentication"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Face authentication"</string>
+    <string name="security_settings_face_enroll_education_title" msgid="2695443729648587731">"How to set up Face Unlock"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="4697363240703556987">"Use your face to authenticate"</string>
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +412,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
     <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
@@ -2187,7 +2192,7 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="1374048678465697350">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full contol of your device?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
@@ -2196,8 +2201,17 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
+    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
+    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"View and control screen"</string>
+    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"It can read all content on the screen and display content over other apps."</string>
+    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"View and platform actions"</string>
+    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"It can track your interactions with an app or a hardware sensor, and interact with apps on your behalf."</string>
+    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"Allow"</string>
+    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"Deny"</string>
+    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"Stop"</string>
+    <string name="accessibility_dialog_button_cancel" msgid="5006357240387387028">"Cancel"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tapping OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="4593387199926310801">"Tapping <xliff:g id="STOP">%1$s</xliff:g> will stop <xliff:g id="SERVICE">%2$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No service selected"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
@@ -4313,8 +4327,8 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"This feature is not available"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"It will slow down this phone"</string>
+    <string name="disabled_feature" msgid="3232554901854971743">"Feature not available"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="3557117039415422481">"This feature has been turned off because it slows down your phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Allow background activity starts"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3401f0c..4d0e99e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -399,6 +399,9 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap to set up face authentication"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Face authentication"</string>
+    <string name="security_settings_face_enroll_education_title" msgid="2695443729648587731">"How to set up Face Unlock"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="4697363240703556987">"Use your face to authenticate"</string>
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +412,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
     <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
@@ -2187,7 +2192,7 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="1374048678465697350">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full contol of your device?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
@@ -2196,8 +2201,17 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
+    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
+    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"View and control screen"</string>
+    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"It can read all content on the screen and display content over other apps."</string>
+    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"View and platform actions"</string>
+    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"It can track your interactions with an app or a hardware sensor, and interact with apps on your behalf."</string>
+    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"Allow"</string>
+    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"Deny"</string>
+    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"Stop"</string>
+    <string name="accessibility_dialog_button_cancel" msgid="5006357240387387028">"Cancel"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tapping OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="4593387199926310801">"Tapping <xliff:g id="STOP">%1$s</xliff:g> will stop <xliff:g id="SERVICE">%2$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No service selected"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
@@ -3482,7 +3496,7 @@
     <string name="zen_mode_add_time_rule" msgid="7890557350868257760">"Add time schedule"</string>
     <string name="zen_mode_delete_rule" msgid="8055032645990309096">"Delete schedule"</string>
     <string name="zen_mode_choose_rule_type" msgid="40993242338494595">"Choose schedule type"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \'<xliff:g id="RULE">%1$s</xliff:g>\' rule?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Delete"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"These settings can\'t be changed at the moment. An app (<xliff:g id="APP_NAME">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behaviour."</string>
@@ -3519,7 +3533,7 @@
     <string name="zen_mode_calls" msgid="4769117032399813012">"Allow calls"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"Calls"</string>
     <string name="zen_mode_calls_footer" msgid="2002070641802102110">"To make sure that allowed calls make sound, check whether your device is set to ring, vibrate or silent."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
@@ -3527,7 +3541,7 @@
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="2616568463646674149">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
-    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS and messaging apps"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
@@ -4313,8 +4327,8 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"This feature is not available"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"It will slow down this phone"</string>
+    <string name="disabled_feature" msgid="3232554901854971743">"Feature not available"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="3557117039415422481">"This feature has been turned off because it slows down your phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Allow background activity starts"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3401f0c..4d0e99e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -399,6 +399,9 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap to set up face authentication"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Face authentication"</string>
+    <string name="security_settings_face_enroll_education_title" msgid="2695443729648587731">"How to set up Face Unlock"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="4697363240703556987">"Use your face to authenticate"</string>
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +412,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
     <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
@@ -2187,7 +2192,7 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="1374048678465697350">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full contol of your device?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
@@ -2196,8 +2201,17 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
+    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
+    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"View and control screen"</string>
+    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"It can read all content on the screen and display content over other apps."</string>
+    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"View and platform actions"</string>
+    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"It can track your interactions with an app or a hardware sensor, and interact with apps on your behalf."</string>
+    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"Allow"</string>
+    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"Deny"</string>
+    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"Stop"</string>
+    <string name="accessibility_dialog_button_cancel" msgid="5006357240387387028">"Cancel"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tapping OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="4593387199926310801">"Tapping <xliff:g id="STOP">%1$s</xliff:g> will stop <xliff:g id="SERVICE">%2$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No service selected"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
@@ -3482,7 +3496,7 @@
     <string name="zen_mode_add_time_rule" msgid="7890557350868257760">"Add time schedule"</string>
     <string name="zen_mode_delete_rule" msgid="8055032645990309096">"Delete schedule"</string>
     <string name="zen_mode_choose_rule_type" msgid="40993242338494595">"Choose schedule type"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \'<xliff:g id="RULE">%1$s</xliff:g>\' rule?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Delete"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"These settings can\'t be changed at the moment. An app (<xliff:g id="APP_NAME">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behaviour."</string>
@@ -3519,7 +3533,7 @@
     <string name="zen_mode_calls" msgid="4769117032399813012">"Allow calls"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"Calls"</string>
     <string name="zen_mode_calls_footer" msgid="2002070641802102110">"To make sure that allowed calls make sound, check whether your device is set to ring, vibrate or silent."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
@@ -3527,7 +3541,7 @@
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"Allow messages"</string>
     <string name="zen_mode_messages_footer" msgid="2616568463646674149">"To make sure that allowed messages make sound, check whether your device is set to ring, vibrate or silent."</string>
-    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS and messaging apps"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
@@ -4313,8 +4327,8 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"This feature is not available"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"It will slow down this phone"</string>
+    <string name="disabled_feature" msgid="3232554901854971743">"Feature not available"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="3557117039415422481">"This feature has been turned off because it slows down your phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Allow background activity starts"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 87e5036..c1aeb72 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -398,6 +398,9 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎Face added‎‏‎‎‏‎"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎Tap to set up face authentication‎‏‎‎‏‎"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎Face authentication‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_title" msgid="2695443729648587731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎How to set up Face unlock‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="4697363240703556987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎Use your face to authenticate‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎Use accessibility setup‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -408,7 +411,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎Use your face to unlock your phone, authorize purchases, or sign in to apps.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎Use your face to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: You can’t use your face to unlock this device. For more information, contact your organization’s admin.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎Use your face to unlock your phone, authorize purchases, or sign in to apps‎‏‎‎‏‎"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎Center your face in the circle‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎Do it later‎‏‎‎‏‎"</string>
     <string name="face_add_max" msgid="4408683751143942949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ faces‎‏‎‎‏‎"</string>
@@ -2186,7 +2191,7 @@
     <string name="color_cyan" msgid="7033027180641173211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎Cyan‎‏‎‎‏‎"</string>
     <string name="color_yellow" msgid="9112680561610873529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎Yellow‎‏‎‎‏‎"</string>
     <string name="color_magenta" msgid="5059212823607815549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎Magenta‎‏‎‎‏‎"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎Use ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="enable_service_title" msgid="1374048678465697350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to have full contol of your device?‎‏‎‎‏‎"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ needs to:‎‏‎‎‏‎"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎Because an app is obscuring a permission request, Settings can’t verify your response.‎‏‎‎‏‎"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎If you turn on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎, your device won’t use your screen lock to enhance data encryption.‎‏‎‎‏‎"</string>
@@ -2195,8 +2200,17 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your PIN.‎‏‎‎‏‎"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your password.‎‏‎‎‏‎"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps.‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_warning_description" msgid="5678294638592090340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎Full control is appropriate for apps that help you with accessibility needs, but not for most apps.‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_screen_control_title" msgid="1262218781398117580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎View and control screen‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_screen_control_description" msgid="5263900135083661468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎It can read all content on the screen and display content over other apps.‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_action_perform_title" msgid="5228338448018587344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎View and platform actions‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_action_perform_description" msgid="2402904134246069476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎It can track your interactions with an app or a hardware sensor, and interact with apps on your behalf.‎‏‎‎‏‎"</string>
+    <string name="accessibility_dialog_button_allow" msgid="8427955451281232788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎Allow‎‏‎‎‏‎"</string>
+    <string name="accessibility_dialog_button_deny" msgid="4307331121783796869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎Deny‎‏‎‎‏‎"</string>
+    <string name="accessibility_dialog_button_stop" msgid="7861331860214808622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎Stop‎‏‎‎‏‎"</string>
+    <string name="accessibility_dialog_button_cancel" msgid="5006357240387387028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎Stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎Tapping OK will stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="disable_service_message" msgid="4593387199926310801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎Tapping ‎‏‎‎‏‏‎<xliff:g id="STOP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%2$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎No services installed‎‏‎‎‏‎"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎No service selected‎‏‎‎‏‎"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎No description provided.‎‏‎‎‏‎"</string>
@@ -4312,8 +4326,8 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎Update Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎Pause notifications to stay focused‎‏‎‎‏‎"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎This feature is not available on this device‎‏‎‎‏‎"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎This feature is not available‎‏‎‎‏‎"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎It will slow down this phone‎‏‎‎‏‎"</string>
+    <string name="disabled_feature" msgid="3232554901854971743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎Feature not available‎‏‎‎‏‎"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="3557117039415422481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎This feature has been turned off because it slows down your phone‎‏‎‎‏‎"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎Force full GNSS measurements‎‏‎‎‏‎"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎Track all GNSS constellations and frequencies with no duty cycling‎‏‎‎‏‎"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎Allow background activity starts‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 621a27a..8194283 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -360,7 +360,7 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"El administrador inhabilitó la opción"</string>
     <string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opción de bloqueo"</string>
     <string name="lockdown_settings_summary" msgid="429230431748285997">"Mostrar la opción del botón de encendido que desactiva Smart Lock, el desbloqueo con huella digital y las notificaciones en la pantalla bloqueada"</string>
-    <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Extender desbloqueo de agentes de conf."</string>
+    <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Los agentes de confianza solo extienden el desbloqueo"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si habilitas la opción, los agentes de confianza mantendrán el dispositivo desbloqueado durante más tiempo, pero ya no podrán desbloquear un dispositivo bloqueado."</string>
     <string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear pantalla al perder confianza"</string>
     <string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si habilitas la opción, el dispositivo se bloqueará cuando el último agente de confianza pierda este privilegio"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Se agregó el rostro"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toca para configurar la autentic. facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticación facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Usar config. de accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa tu rostro para desbloquear el teléfono, autorizar compras o acceder a las apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Usa tu rostro para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usarlo para desbloquear este dispositivo. Si quieres obtener más detalles, comunícate con el administrador de la organización."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa tu rostro para desbloquear el teléfono, autorizar compras o acceder a las apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra el rostro en el círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Hacerlo más tarde"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> rostros"</string>
@@ -1980,7 +1987,7 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Ayuda del teclado"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclado físico"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostrar teclado virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Mantener en la pantalla cuando el teclado físico está activo"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Mantener en la pantalla cuando el teclado físico esté activo"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Asistente de combinación de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar accesos directos disponibles"</string>
     <string name="language_and_input_for_work_category_title" msgid="3825906835886710498">"Teclados y herramientas del perfil de trabajo"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarillo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar la contraseña."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando el control total de este dispositivo. El servicio puede leer la pantalla y realizar acciones para los usuarios que necesitan accesibilidad. Este nivel de control no es apropiado para la mayoría de las apps."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"¿Quieres detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Si presionas Aceptar, <xliff:g id="SERVICE">%1$s</xliff:g> se detendrá."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se instaló ningún servicio."</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No se seleccionó ningún servicio"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
@@ -4311,8 +4338,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No interrumpir"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esta función no está disponible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Esta función ralentizará el teléfono"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar dimensiones GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir inicio de actividades en segundo plano"</string>
@@ -4547,7 +4576,7 @@
     <string name="keywords_content_capture" msgid="8252675452668954083">"captura de contenido, contenido de app"</string>
     <string name="content_capture" msgid="3210232615756364639">"Contenido de la app"</string>
     <string name="content_capture_summary" msgid="659506647507221852">"Permite que las apps envíen contenido al sistema Android"</string>
-    <string name="capture_system_heap_dump_title" msgid="8043655498113164693">"Capturar volcado del pila del sistema"</string>
+    <string name="capture_system_heap_dump_title" msgid="8043655498113164693">"Capturar volcado de pila del sistema"</string>
     <string name="capturing_system_heap_dump_message" msgid="8680086369500395131">"Capturando volcado del montón del sistema"</string>
     <string name="error_capturing_system_heap_dump_message" msgid="6346229989760615103">"No se pudo capturar el volcado de pila del sistema"</string>
     <string name="automatic_system_heap_dump_title" msgid="442496436397957988">"Capturar automáticamente volcados de pila del sistema"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b0b0132..f00dfca 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Cara añadida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toca para configurar la autentic. facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticación facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Utilizar ajustes accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa tu cara para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utiliza tu cara para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes utilizar tu cara para desbloquear este dispositivo. Si quieres consultar más información, ponte en contacto con el administrador de tu organización."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa tu cara para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra la cara en el círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"En otro momento"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> caras"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarillo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Una aplicación está bloqueando una solicitud de permiso, por lo que Ajustes no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu contraseña."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando el control completo del dispositivo. El servicio puede leer la pantalla y actuar en nombre de los usuarios que necesitan funciones de accesibilidad. El nivel de control no es adecuado para la mayoría de las aplicaciones."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se ha instalado ningún servicio."</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No se ha seleccionado ningún servicio"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No molestar"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función no está disponible en este dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esta función no está disponible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Esta función ralentizará el teléfono"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar mediciones de GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Registrar todas las frecuencias y constelaciones de GNSS sin ciclo de servicio"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir el inicio de actividades en segundo plano"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 814c0d3..f3a605a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Nägu on lisatud"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Puudutage näo autentimise seadistamiseks"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Näo autentimine"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Kasuta juurdepääset. seadistust"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Kasutage oma nägu telefoni avamiseks, ostude volitamiseks või rakendustesse sisselogimiseks."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma nägu.\n\nMärkus: te ei saa kasutada oma nägu selle seadme avamiseks. Lisateabe saamiseks võtke ühendust oma organisatsiooni administraatoriga."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Kasutage oma nägu telefoni avamiseks, ostude volitamiseks või rakendustesse sisselogimiseks"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Hoidke oma nägu ringi keskel"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Teen seda hiljem"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Lisada saab kuni <xliff:g id="COUNT">%d</xliff:g> nägu"</string>
@@ -893,7 +900,7 @@
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Jäta võrk meelde"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Võrkude kuvamiseks lülitage WiFi sisse."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"WiFi-võrkude otsimine ..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Teil pole WiFi-võrgu muutmiseks luba."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Tsüaan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Kollane"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Fuksia"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> teeb järgmist:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma PIN-koodi."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma parooli."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> taotleb seadme täielikku haldusõigust. Teenus saab juurdepääsufunktsioone vajavate kasutajate nimel ekraani lugeda ja tegutseda. See haldusõiguse tase ei ole enamiku rakenduste puhul sobilik."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Kas peatan teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Kui puudutate valikut OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatub."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ükski teenus ei ole valitud"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
@@ -2690,8 +2717,8 @@
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Tsükli muutmine ..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Kuupäev andmekasutustsükli lähtestamiseks:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Sel perioodil ei kasut. andmeid ükski rakendus."</string>
-    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Esiplaan"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Taust"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Esiplaanil"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Taustal"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"piiratud"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Kas lülitada mobiilne andmeside välja?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Seadke mobiilandmeside piirang"</string>
@@ -3050,7 +3077,7 @@
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
     <string name="network_dashboard_title" msgid="3135144174846753758">"Võrk ja Internet"</string>
-    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiil"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiilivõrk"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmeside kasutus"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"kuumkoht"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Värskendage režiimi Mitte segada"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskendumiseks peatage märguanded"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Sellel seadmel pole see funktsioon saadaval"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"See funktsioon pole saadaval"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"See muudab selle telefoni aeglasemaks"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Jõusta GNSS-i täielikud mõõtmistulemused"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Jälgi kõiki GNSS-i radu ja sagedusi ilma töötsüklita"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Luba taustategevuste käivitamine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 02a5fa2..939b14b 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -361,15 +361,15 @@
     <string name="lockdown_settings_title" msgid="7393790212603280213">"Erakutsi blokeatzeko aukera"</string>
     <string name="lockdown_settings_summary" msgid="429230431748285997">"Bistaratu etengailu bat pantaila blokeatuan, Smart Lock, hatz-marka bidezko desblokeoa eta jakinarazpenak desaktibatzeko aukera ematen duena"</string>
     <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Fidagarritasun-agenteek soilik luzatzen dute desblokeoa"</string>
-    <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Gaitzen bada, fidagarritasun-agenteek denbora luzeagoz mantenduko dute gailua desblokeatuta, baina ezingo dituzte desblokeatu blokeatuta dauden gailuak."</string>
+    <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Gaitzen bada, fidagarritasun-agenteek denbora luzeagoz mantenduko dute gailua desblokeatuta, baina ezingo dituzte desblokeatu blokeatuta dauden gailuak"</string>
     <string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Blokeatu pantaila fidagarritasuna galtzean"</string>
     <string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Gaitzen bada, gailua blokeatu egingo da azken fidagarritasun-agenteak fidagarritasuna galtzen duenean"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Bat ere ez"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Adibidez, Jonen Android gailua."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Erabiltzaile-info."</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Erakutsi profilaren informazioa pantaila blokeatuan."</string>
-    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilaren informazioa"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Erakutsi profileko informazioa pantaila blokeatuan."</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profileko informazioa"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Erabili kokapena"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gehitu da aurpegia"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Sakatu aurpegi bidezko autentifikazioa konfiguratzeko"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Aurpegi bidezko autentifikazioa"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Erabili erabilerraztasun-konfigurazioa"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Erabili aurpegia telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Erabili aurpegia telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu aurpegia erabili gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Erabili aurpegia telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Zentratu aurpegia zirkuluan"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Geroago"</string>
     <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> aurpegi gehi ditzakezu"</string>
@@ -1467,7 +1474,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Arakatu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8845766044697204852">"Hauek dira \"Beste fitxategi batzuk\" atalean gordetzen diren fitxategiak: aplikazioek gordetako fitxategi partekatuak, Internetetik edo Bluetooth konexioaren bidez deskargatutakoak, Android fitxategiak, etab.\n\n<xliff:g id="NAME">^1</xliff:g> honetan ikusgai dagoen edukia ikusteko, sakatu Arakatu."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android-en <xliff:g id="VERSION">%s</xliff:g> bertsioa exekutatzeko balio duten fitxategiak daude sisteman"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android-en <xliff:g id="VERSION">%s</xliff:g>. bertsioa exekutatzeko balio duten fitxategiak daude sisteman"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Baliteke <xliff:g id="USER_0">^1</xliff:g> erabiltzaileak argazkiak, musika, aplikazioak edo bestelako datuak gorde izatea, memorian <xliff:g id="SIZE">^2</xliff:g> hartuta. \n\nXehetasunak ikusteko, aldatu <xliff:g id="USER_1">^1</xliff:g> erabiltzailearen kontura."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguratu <xliff:g id="NAME">^1</xliff:g> memoria"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Erabili biltegiratze-gailu eramangarri gisa"</string>
@@ -1580,7 +1587,7 @@
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Berrezartzeko aukerak"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"Sarea, aplikazioak edota gailua berrezar daitezke"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Berrezarri wifi, Bluetooth eta sare mugikorrak"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wifia"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth-a"</li></string>
     <string name="reset_esim_title" msgid="1979762943163078939">"Ezabatu deskargatutako SIMen edukia"</string>
     <string name="reset_esim_desc" msgid="5940105242448544634">"Ordezko SIM txartelak deskargatzeko, jarri operadorearekin harremanetan. Ez da utziko bertan behera mugikorraren zerbitzu-planik."</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
@@ -1855,7 +1862,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Larrialdietarako aplikazioa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Berrezarri aplikazioen hobespenak"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Aplikazioen hobespenak berrezarri nahi dituzu?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"Desgaitutako aplikazioak"</li>\n<li>"Desgaitutako aplikazio-jakinarazpenak"</li>\n<li>"Ekintza jakinetarako aplikazio lehenetsiak"</li>\n<li>"Aplikazioen atzeko planoko datuen murrizketak"</li>\n<li>"Edozein baimen-murrizketa"</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"desgaitutako aplikazioak,"</li>\n<li>"desgaitutako aplikazio-jakinarazpenak,"</li>\n<li>"ekintza jakinetarako aplikazio lehenetsiak,"</li>\n<li>"aplikazioen atzeko planoko datuen murriztapenak eta"</li>\n<li>"baimen-murriztapenak."</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Berrezarri aplikazioak"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kudeatu tokia"</string>
     <string name="filter" msgid="2018011724373033887">"Iragazi"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Ziana"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Horia"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua erabili nahi duzu?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hauek egin behar ditu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, PIN kodea berretsi behar duzu."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, pasahitza berretsi behar duzu."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak gailu honen kontrol osoa izan nahi du. Zerbitzuak pantaila irakur dezake, eta erabilerraztasun-beharrak dituzten erabiltzaileen ordez jardun. Kontrol-maila hau ez da egokia aplikazio gehienetarako."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua gelditu?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ados sakatuta, <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua gelditu egingo da."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ez dago zerbitzurik instalatuta"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ez da hautatu zerbitzurik"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ez da azalpenik eman."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Eguneratu \"Ez molestatu\" modua"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Eginbide hau ez dago erabilgarri"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Telefonoa moteldu egingo da"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Behartu GNSS neurketa osoak gauzatzera"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Baimendu atzeko planoko jarduerak abiaraztea"</string>
@@ -4506,7 +4535,7 @@
     <string name="force_desktop_mode" msgid="4303240595324847998">"Behartu mahaigainerako modua erabiltzera"</string>
     <string name="force_desktop_mode_summary" msgid="6259798246015387202">"Behartu mahaigainerako modu esperimentala erabiltzera bigarren mailako pantailetan"</string>
     <string name="hwui_force_dark_title" msgid="2466919877609396257">"Ez aplikatu gai iluna"</string>
-    <string name="hwui_force_dark_summary" msgid="8705328793382981780">"Gai iluna beti aktibatuta egoteko eskakizuna ez aplikatzeko aukera du"</string>
+    <string name="hwui_force_dark_summary" msgid="8705328793382981780">"Gai iluna beti aktibatuta egoteko eskakizuna gainidazten du"</string>
     <string name="privacy_dashboard_title" msgid="2458407399263943923">"Pribatutasuna"</string>
     <string name="privacy_dashboard_summary" msgid="4570241983077984329">"Baimenak, kontuko jarduerak, datu pertsonalak"</string>
     <string name="contextual_card_dismiss_remove" msgid="2813670241047194713">"Kendu"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c2917ca..ae1592c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -360,8 +360,8 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"غیرفعال‌شده توسط سرپرست"</string>
     <string name="lockdown_settings_title" msgid="7393790212603280213">"نمایش گزینه «قفل همه»"</string>
     <string name="lockdown_settings_summary" msgid="429230431748285997">"‏نمایش گزینه دکمه روشن/خاموش که Smart Lock، باز کردن قفل با اثرانگشت و اعلان‌های در صفحه قفل را خاموش می‌کند"</string>
-    <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"فقط نماینده معتمد حالت باز را افزایش می‌دهد"</string>
-    <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"درصورتی‌که فعال باشد، نماینده‌های معتمد برای مدت طولانی‌تری دستگاهتان باز نگه می‌دارند اما دیگر نمی‌توانند دستگاه قفلی را باز کنند."</string>
+    <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"نماینده‌های معتمد فقط تمدید حالت باز"</string>
+    <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"اگر فعال شود، نماینده‌های معتمد برای مدت طولانی‌تری دستگاهتان را باز نگه می‌دارند اما دیگر نمی‌توانند دستگاه قفلی را باز کنند."</string>
     <string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"صفحه قفل وقتی اعتماد از بین می‌رود"</string>
     <string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"اگر فعال باشد، وقتی اعتماد آخرین نماینده معتمد دستگاه از بین برود، دستگاه قفل می‌شود"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"هیچ‌کدام"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"چهره افزوده شد"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"برای تنظیم تشخیص چهره ضربه بزنید"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"احراز هویت با چهره"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"استفاده از تنظیمات دسترس‌پذیری"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"از چهره‌تان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از چهره‌تان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"صورتتان را در مرکز دایره قرار دهید"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"بعداً انجام شود"</string>
     <string name="face_add_max" msgid="4408683751143942949">"می‌توانید حداکثر <xliff:g id="COUNT">%d</xliff:g> چهره اضافه کنید"</string>
@@ -824,7 +831,7 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"‏<xliff:g id="REQUESTER">%s</xliff:g> می‌خواهد Wi-Fi را روشن کند"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"‏<xliff:g id="REQUESTER">%s</xliff:g> می‌خواهد Wi-Fi را خاموش کند"</string>
     <string name="art_verifier_for_debuggable_title" msgid="6029838014407791341">"تأیید بایت‌کد برنامه‌های اشکال‌زدا"</string>
-    <string name="art_verifier_for_debuggable_summary" msgid="2250352478065428399">"‏ART برای تأیید بایت‌کد برنامه‌های اشکال‌زدا مجاز شود"</string>
+    <string name="art_verifier_for_debuggable_summary" msgid="2250352478065428399">"‏به ART برای تأیید بایت‌کد برنامه‌های اشکال‌زدا اجازه داده شود"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"تبادل داده هنگامیکه رایانهٔ لوحی در تماس با دستگاه دیگر است مجاز باشد"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس می‌کند"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"سبز آبی"</string>
     <string name="color_yellow" msgid="9112680561610873529">"زرد"</string>
     <string name="color_magenta" msgid="5059212823607815549">"زرشکی"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر <xliff:g id="SERVICE">%1$s</xliff:g> را روشن کنید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید پینتان را تأیید کنید."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید گذرواژه‌تان را تأیید کنید."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> کنترل کامل بر این دستگاه را درخواست می‌کند. این سرویس می‌تواند صفحه را بخواند و ازطرف افرادی که مشکل دسترسی دارند، عمل کند. این سطح کنترل برای اکثر برنامه‌ها مناسب نیست."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> متوقف شود؟"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"با ضربه زدن به تأیید، <xliff:g id="SERVICE">%1$s</xliff:g> متوقف خواهد شد."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"سرویسی انتخاب نشده است"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"شرحی ارائه نشده است."</string>
@@ -2886,7 +2913,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"کاربر جدیدی اضافه می‌کنید؟"</string>
-    <string name="user_add_user_message_long" msgid="6768718238082929201">"‏می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و می‌تواند این فضا را با برنامه‌ها، تصویرزمینه و موارد دیگر سفارشی کند. کاربران همچنین می‌توانند تنظیماتی را در دستگاه ایجاد کنند که بر همه کاربرها تأثیر می‌گذارد، مانند Wi-Fi.\n\nوقتی کاربری جدید اضافه می‌کنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر می‌تواند برنامه‌ها را برای سایر کاربران به‌روزرسانی کند. دسترس‌پذیری، تنظیمات و سرویس‌ها قابل انتقال به کاربر جدید نیستند."</string>
+    <string name="user_add_user_message_long" msgid="6768718238082929201">"‏با ایجاد کاربران دیگر، می‌توانید این دستگاه را با دیگران به‌اشتراک بگذارید. هر کاربر فضای مخصوص به خودش را دارد که می‌تواند آن را با برنامه‌ها، تصویرزمینه و موارد دیگر سفارشی کند. کهمچنین کاربران می‌توانند تنظیماتی در دستگاه ایجاد کنند، مانند تنظیمات Wi-Fi، که بر تنظیمات بقیه اثر دارد.\n\nوقتی کاربر جدیدی اضافه می‌کنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر می‌تواند برنامه‌ها را برای سایر کاربران به‌روزرسانی کند. دسترس‌پذیری، تنظیمات و سرویس‌ها قابل‌انتقال به کاربر جدید نیستند."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"وقتی کاربر جدیدی اضافه می‌کنید آن فرد باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هم اکنون کاربر تنظیم شود؟"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"مطمئن شوید شخص در دسترس است تا دستگاه را بگیرد و فضایش را تنظیم کند"</string>
@@ -3221,7 +3248,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"هنگام دریافت اعلان‌، تلفنتان صدا نمی‌دهد یا نمی‌لرزد."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"بدون تصویر یا صدای اعلان‌ها"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"اعلان‌ها را نخواهید دید یا صدایشان را نخواهید شنید."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"تلفنتان برای اعلان‌های جدید یا موجود، صدایی ایجاد نمی‌کند، نمی‌لرزد یا آن‌ها را نشان نمی‌دهد. به خاطر داشته باشید، اعلان‌های مهم مربوط به فعالیت و وضعیت تلفن هنوز نمایش داده می‌شود.\n\nوقتی «مزاحم نشوید» را خاموش می‌کنید، می‌توانید با تند کشیدن از بالای صفحه به پایین، اعلان‌های بررسی‌نشده را پیدا کنید."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"تلفنتان برای اعلان‌های جدید یا موجود صدایی نمی‌کند، نمی‌لرزد، یا آن‌ها را نشان نمی‌دهد. به‌خاطر داشته باشید، اعلان‌های مهم مربوط به فعالیت و وضعیت تلفن هنوز نمایش داده می‌شود.\n\nوقتی «مزاحم نشوید» را خاموش می‌کنید، می‌توانید با تند کشیدن از بالای صفحه به پایین، اعلان‌های بررسی‌نشده را پیدا کنید."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"سفارشی"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"فعال کردن تنظیم سفارشی"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"حذف تنظیم سفارشی"</string>
@@ -3279,7 +3306,7 @@
     <string name="zen_category_exceptions" msgid="7601136604273265629">"استثناها"</string>
     <string name="zen_category_schedule" msgid="9000447592251450453">"زمان‌بندی"</string>
     <string name="zen_sound_title" msgid="4461494611692749446">"مشاهده همه استثناها"</string>
-    <string name="zen_sound_footer" msgid="7621745273287208979">"وقتی «مزاحم نشوید» روشن است، به‌غیر از مواردی که در بالا مجاز می‌کنید، صدا و لرزش صامت می‌شوند."</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"وقتی «مزاحم نشوید» روشن باشد، به‌غیراز مواردی که در بالا مجاز می‌کنید، صدا و لرزش صامت می‌شوند."</string>
     <string name="zen_sound_category_title" msgid="4336596939661729188">"صامت کردن همه به‌جز"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"صامت"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"صامت نشده است"</string>
@@ -3329,7 +3356,7 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"اجازه به نقطه‌های اعلان"</string>
     <string name="notification_bubbles_title" msgid="526545466417027926">"ابزارک‌های اعلان"</string>
     <string name="notification_bubbles_summary" msgid="5269674863510678257">"دسترسی سریع به محتوای برنامه از هرجایی بااستفاده از میانبرهای شنارو"</string>
-    <string name="bubbles_feature_education" msgid="69923617148394578">"برخی اعلان‌ها و سایر محتواها می‌توانند درقالب ابزارک اعلان روی صفحه نشان داده شود. برای باز کردن یک ابزارک اعلان، روی آن ضربه بزنید. برای نپذیرفتن آن، آن را به پایین صفحه بکشید."</string>
+    <string name="bubbles_feature_education" msgid="69923617148394578">"برخی اعلان‌ها و سایر محتواها می‌تواند درقالب ابزارک اعلان روی صفحه نشان داده شود. برای باز کردن ابزارک اعلان، روی آن ضربه بزنید. برای رد کردن، آن را به پایین صفحه بکشید."</string>
     <string name="bubbles_app_toggle_title" msgid="9143702245165359360">"ابزارک‌های اعلان"</string>
     <string name="bubbles_app_toggle_summary" msgid="7714358008428342285">"مجاز کردن <xliff:g id="APP_NAME">%1$s</xliff:g> برای نمایش برخی اعلان‌ها درقالب ابزارک اعلان"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="8013961655723563787">"روشن کردن ابزارک اعلان"</string>
@@ -3512,21 +3539,21 @@
     <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"رفتار «مزاحم نشوید»"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"استفاده از تنظیمات پیش‌فرض"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"ایجاد تنظیمات سفارشی برای این زمان‌بندی"</string>
-    <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"به‌مدت «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>»"</string>
+    <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>»"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> ‏- <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="4769117032399813012">"اجازه به تماس‌ها"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"تماس‌ها"</string>
     <string name="zen_mode_calls_footer" msgid="2002070641802102110">"برای اطمینان از ایجاد صدا هنگام دریافت تماس‌های مجاز، بررسی کنید دستگاهتان برای به صدا در آوردن زنگ، لرزش یا حالت بی‌صدا تنظیم شده باشد."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"تماس‌های ورودی به‌مدت «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود می‌شود. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دسترسی به خودتان بدهید، می‌توانید تنظیمات را تغییر دهید."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"تماس‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود می‌شود. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دسترسی به خودتان بدهید، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"مخاطبین ستاره‌دار"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"اجازه دادن به پیام‌ها"</string>
-    <string name="zen_mode_messages_footer" msgid="2616568463646674149">"برای اطمینان از ایجاد صدا هنگام دریافت پیام‌های مجاز، بررسی کنید دستگاهتان برای به صدا در آوردن زنگ، لرزش یا حالت بی‌صدا تنظیم شده باشد."</string>
+    <string name="zen_mode_messages_footer" msgid="2616568463646674149">"برای اینکه ببینید پیام‌های مجاز صدا دارند، ببینید دستگاهتان روی زنگ زدن، یا لرزش، یا حالت بی‌صدا تنظیم کرده‌اید یا نه."</string>
     <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"پیام‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود شده‌اند. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دهید به شما دسترسی داشته باشند، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"برنامه‌های پیام‌رسان، پیامک و فراپیام"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"از هر کسی"</string>
@@ -3559,7 +3586,7 @@
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"مخاطبین ستاره‌دار"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"تماس‌گیرنده‌های تکراری"</string>
     <string name="zen_mode_repeat_callers_list" msgid="2529895519653237330">"تماس‌گیرنده‌های تکراری"</string>
-    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"اجازه دادن به تماس‌گیرندگانی که در ۱۵ دقیقه دو بار تماس می‌گیرند"</string>
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"اجازه دادن به تماس‌گیرندگان تکراری"</string>
     <string name="zen_mode_calls_summary_one" msgid="1711737896388108388">"اجازه از <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="8476861928783654064">"اجازه از <xliff:g id="CALLER_TYPE">%1$s</xliff:g> و <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"اگر فردی در طول یک دوره <xliff:g id="MINUTES">%d</xliff:g> دقیقه‌ای، برای بار دوم تماس بگیرد"</string>
@@ -3905,7 +3932,7 @@
     <string name="display_dashboard_nowallpaper_summary" msgid="7840559323355210111">"حالت خواب، اندازه قلم"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"خواب پس از ۱۰ دقیقه عدم فعالیت"</string>
     <string name="memory_summary" msgid="8080825904671961872">"به‌طور متوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> از <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> حافظه استفاده شده است"</string>
-    <string name="users_summary" msgid="1674864467098487328">"واردشده به سیستم با <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"به‌عنوان <xliff:g id="USER_NAME">%1$s</xliff:g> به سیستم وارد شده‌اید"</string>
     <string name="payment_summary" msgid="3472482669588561110">"پیش‌فرض: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="backup_disabled" msgid="485189128759595412">"پشتیبان‌گیری غیرفعال است"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏به‌روزرسانی‌شده به Android نسخه <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -4313,10 +4340,12 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"به‌روزرسانی «مزاحم نشوید»"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"توقف موقت اعلان‌ها برای متمرکز ماندن"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"این ویدیو در این دستگاه دردسترس نیست."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"این ویژگی دردسترس نیست"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"این کار عملکرد تلفن را کند می‌کند"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏اجرای کامل اندازه‌گیری GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"بدون دوره کاری همه زنجیره عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"بدون دوره کاری، همه دسته عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"اجازه دادن به شروع فعالیت پس‌زمینه"</string>
     <string name="allow_background_activity_starts_summary" msgid="6837591829176921245">"به همه فعالیت‌های پس‌زمینه اجازه شروع می‌دهد"</string>
     <string name="show_first_crash_dialog" msgid="8889957119867262599">"همیشه کادر گفتگوی خرابی نمایش داده شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6a1474b..ae4c88e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Kasvot lisätty"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Määritä kasvojentunnistus napauttamalla"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Kasvojentunnistus"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Käytä esteettömyysvalintoja"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Voit avata puhelimen, hyväksyä ostoksia tai kirjautua sisään sovelluksiin kasvojen avulla."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Tämän laitteen lukitusta ei voi avata kasvojentunnistuksella. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Voit avata puhelimen, hyväksyä ostoksia tai kirjautua sisään sovelluksiin kasvojen avulla."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Keskitä kasvosi ympyrän sisälle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Tee myöhemmin"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> kasvoa"</string>
@@ -940,12 +947,12 @@
     <string name="wifi_privacy_settings" msgid="5500777170960315928">"Tietosuoja"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="1539659414108891004">"Satunnaistettu MAC-osoite"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8674936581557695411">"Lisää laite"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"Lisää laite verkkoon <xliff:g id="SSID">%1$s</xliff:g> keskittämällä alla olevaan QR-koodiin"</string>
+    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"Lisää laite verkkoon <xliff:g id="SSID">%1$s</xliff:g> keskittämällä alla olevaan QR-koodiin."</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"Lue QR-koodi"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"Yhdistä verkkoon <xliff:g id="SSID">%1$s</xliff:g> keskittämällä alla olevaan QR-koodiin"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Yhdistä Wi-Fi-verkkoon lukemalla QR-koodi"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Yhdistä Wi-Fi-verkkoon lukemalla QR-koodi."</string>
     <string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Jaa Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> ja jaa salasana lukemalla tämä QR-koodi"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> ja jaa salasana lukemalla tämä QR-koodi."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
     <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR-koodin luku epäonnistui. Keskitä koodi ja yritä uudelleen."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
@@ -969,7 +976,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4938294574591503213">"Wi-Fi-verkon salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspotin salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="4072206063308645677">"Lisää laite"</string>
-    <string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Lisää laite tähän verkkoon QR-koodin avulla"</string>
+    <string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Lisää laite tähän verkkoon QR-koodin avulla."</string>
     <string name="retry" msgid="6472609612090877557">"Yritä uudelleen"</string>
     <string name="wifi_shared" msgid="844142443226926070">"Jaa muiden laitteen käyttäjien kanssa"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Turkoosi"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Keltainen"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> saa luvan:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Sovellus peittää lupapyynnön, joten Asetukset ei voi vahvistaa valintaasi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jos <xliff:g id="SERVICE">%1$s</xliff:g> otetaan käyttöön, laitteesi ei käytä näytön lukitusta tiedon salauksen parantamiseen."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa PIN-koodi."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa salasana."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> pyytää laitteen täyttä hallintaoikeutta. Palvelu voi lukea näytön sisällön ja toimia esteettömyyspalvelujen käyttäjien puolesta. Hallintaoikeudet ovat useimmille sovelluksille liian laajat."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Pysäytetäänkö <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Jos valitset OK, <xliff:g id="SERVICE">%1$s</xliff:g> pysäytetään."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Palvelua ei ole valittuna"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Päivitä Älä häiritse ‑tila"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskeytä ilmoitukset, jotta voit keskittyä"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ominaisuus ei ole käytettävissä tällä laitteella."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ominaisuus ei ole käytettävissä"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Se hidastaa puhelinta"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Pakota täydet GNSS-mitat"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Seuraa kaikkia GNSS-kuvioita ja ‑taajuuksia, joissa ei ole pulssisuhdetta."</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Taustatoiminnan salliminen alkaa"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 633af96..088de0f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Touchez pour config. authentif. du visage"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Authentif. du visage"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilisez votre visage pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre visage pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrez votre visage dans le cercle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Plus tard"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> visages"</string>
@@ -1714,7 +1721,7 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"Vous n\'avez pas de connexion Internet. Pour consulter ces renseignements maintenant, accédez à %s sur un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement en cours..."</string>
     <string name="confirm_device_credential_pin" msgid="5308435093406166355">"Utiliser un NIP"</string>
-    <string name="confirm_device_credential_pattern" msgid="1350321840134412900">"Utiliser le schéma"</string>
+    <string name="confirm_device_credential_pattern" msgid="1350321840134412900">"Utiliser un schéma"</string>
     <string name="confirm_device_credential_password" msgid="2195705238498478704">"Utiliser le mot de passe"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"Configurer le verrouillage de l\'écran"</string>
     <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"Pour votre sécurité, définissez un mot de passe"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Jaune"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre NIP."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre mot de passe."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> demande l\'autorisation de contrôler cet appareil. Le service peut lire l\'écran et agir pour les utilisateurs qui font appels aux fonctions d\'accessibilité. Ce niveau de contrôle ne convient pas à la majorité des applications."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Si vous touchez « OK », le service <xliff:g id="SERVICE">%1$s</xliff:g> sera arrêté."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Aucun service sélectionné"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
@@ -2239,7 +2266,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Plus d\'information sur cette imprimante"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pile"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation de la pile non disponible"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation de la pile non disponible."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour les paramètres du mode Ne pas déranger"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Cette fonctionnalité n\'est pas accessible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Elle ralentirait ce téléphone"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forcer les mesures GNSS complètes"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Autoriser le démarrage d\'activité en arrière-plan"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0d2a892..5404759 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Appuyez pour configurer authent. faciale"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Authentificat. faciale"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilisez votre visage pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre visage pour déverrouiller cet appareil. Pour en savoir plus, contactez l\'administrateur de votre organisation."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrer votre visage dans le cercle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Plus tard"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> visages"</string>
@@ -576,7 +583,7 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Aucune sécurité"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Sécurité moyenne"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Code PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Code"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
@@ -596,7 +603,7 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code PIN"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mot de passe"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Une fois que vous avez configuré un verrouillage de l\'écran, vous pouvez également configurer votre empreinte digitale dans Paramètres &gt; Sécurité."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
@@ -722,7 +729,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications actives</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiance"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Pour l\'utiliser, définissez d\'abord un écran de verrouillage."</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Pour utiliser cette option, vous devez d\'abord définir un écran de verrouillage"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Aucun"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> agent de confiance actif</item>
@@ -1294,7 +1301,7 @@
     <string name="sim_reenter_new" msgid="6523819386793546888">"Saisissez à nouveau le code d\'accès."</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"Code PIN de la carte SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Code PIN incorrect."</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"Les codes PIN ne correspondent pas."</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"Les codes ne correspondent pas"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"Impossible de modifier le code PIN.\nLe code PIN est peut-être incorrect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Le code PIN de la carte SIM a été modifié."</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"Impossible de changer l\'état de verrouillage de la carte SIM.\nLe code PIN est peut-être incorrect."</string>
@@ -1727,7 +1734,7 @@
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Saisissez de nouveau votre code"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les codes PIN ne correspondent pas."</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les codes ne correspondent pas"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"Dessinez de nouveau votre schéma"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
@@ -1825,7 +1832,7 @@
     <string name="controls_label" msgid="7611113077086853799">"Commandes"</string>
     <string name="force_stop" msgid="7435006169872876756">"Forcer l\'arrêt"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
-    <string name="application_size_label" msgid="7376689739076506885">"Taille d\'application"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"Taille de l\'application"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Application sur USB"</string>
     <string name="data_size_label" msgid="6117971066063850416">"Données utilisateur"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
@@ -1835,7 +1842,7 @@
     <string name="install_text" msgid="884360662922471113">"Installer"</string>
     <string name="disable_text" msgid="6544054052049395202">"Désactiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activer"</string>
-    <string name="clear_user_data_text" msgid="355574089263023363">"Effacer le stockage"</string>
+    <string name="clear_user_data_text" msgid="355574089263023363">"Effacer les données"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Désinstaller les mises à jour"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
@@ -1871,7 +1878,7 @@
     <string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Calcul de la taille..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Supprimer les données de l\'application ?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Les données de cette application (fichiers, paramètres, comptes, bases de données, etc.) seront définitivement supprimées."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Toutes les données de cette application (fichiers, paramètres, comptes, bases de données, etc.) seront définitivement supprimées."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annuler"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Jaune"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application masque la demande d\'autorisation. Impossible de valider votre réponse via l\'application Paramètres."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Vous devez confirmer le code PIN, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Vous devez confirmer le mot de passe, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> demande le contrôle total de cet appareil. Le service peut lire l\'écran et agir pour le compte des utilisateurs ayant des besoins en matière d\'accessibilité. Ce niveau de contrôle n\'est pas approprié pour la plupart des applications."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Si vous appuyez sur \"OK\", <xliff:g id="SERVICE">%1$s</xliff:g> sera interrompu."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Aucun service sélectionné"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
@@ -2239,7 +2266,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Plus d\'informations sur cette imprimante"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Infos d\'utilisation batterie indisponibles"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Données non disponibles"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant chargement complet"</string>
@@ -2332,7 +2359,7 @@
     <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Vos applications utilisent une quantité normale d\'énergie. Si elles sollicitent trop la batterie, votre téléphone vous suggérera des mesures à prendre.\n\nSi le niveau de votre batterie est faible, vous pouvez également activer l\'économiseur de batterie."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestionnaire de batterie"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gérer les applications automatiquement"</string>
-    <string name="smart_battery_summary" msgid="1339184602000004058">"Limiter l\'utilisation de la batterie pour les applications que vous n\'utilisez pas souvent"</string>
+    <string name="smart_battery_summary" msgid="1339184602000004058">"Limiter l\'utilisation de la batterie pour les applications peu utilisées"</string>
     <string name="smart_battery_footer" product="default" msgid="5555604955956219544">"Si le gestionnaire de batterie détecte que certaines applications déchargent la batterie, vous pouvez choisir de limiter ces applications. Les applications auxquelles une restriction est appliquée peuvent ne pas fonctionner correctement et leurs notifications risquent d\'être retardées."</string>
     <string name="smart_battery_footer" product="tablet" msgid="5555604955956219544">"Si le gestionnaire de batterie détecte que certaines applications déchargent la batterie, vous pouvez choisir de limiter ces applications. Les applications auxquelles une restriction est appliquée peuvent ne pas fonctionner correctement et leurs notifications risquent d\'être retardées."</string>
     <string name="smart_battery_footer" product="device" msgid="5555604955956219544">"Si le gestionnaire de batterie détecte que certaines applications déchargent la batterie, vous pouvez choisir de limiter ces applications. Les applications auxquelles une restriction est appliquée peuvent ne pas fonctionner correctement et leurs notifications risquent d\'être retardées."</string>
@@ -2458,12 +2485,12 @@
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimisation des applications"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Économiseur de batterie"</string>
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"Activer automatiquement"</string>
-    <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"Pas de programmation"</string>
+    <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"Aucun paramétrage"</string>
     <string name="battery_saver_auto_routine" msgid="8076053160450346731">"En fonction de vos habitudes"</string>
-    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"En fonction du pourcentage"</string>
+    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"En fonction du pourcentage de batterie"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"L\'économiseur de batterie s\'activera si l\'autonomie restante risque d\'être insuffisante pour tenir jusqu\'au moment où vous mettez généralement votre téléphone en charge"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"S\'activera à <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Définir une programmation"</string>
+    <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Paramétrer l\'économiseur de batterie"</string>
     <string name="battery_saver_turn_on_summary" msgid="5552800757174173459">"Prolonger l\'autonomie de la batterie"</string>
     <string name="battery_saver_sticky_title_new" msgid="613272902035943099">"Désactiver une fois la batterie complètement chargée"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"L\'économiseur de batterie se désactive lorsque votre téléphone atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour le mode Ne pas déranger"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas disponible sur cet appareil"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Cette fonctionnalité n\'est pas disponible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Elle ralentit le téléphone"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forcer les mesures GNSS complètes"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Effectuer le suivi de toutes les fréquences et constellations GNSS sans rapport cyclique"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Autoriser le démarrage des activités en arrière-plan"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5eecd32..bda7f33 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Engadiuse a cara"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toca e configura a autenticación facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticación facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Usar configur. de accesibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utiliza a túa cara para desbloquear o teléfono, autorizar compras e iniciar sesión en aplicacións."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utiliza a cara para desbloquear o teléfono ou autorizar as compras.\n\nNota: Non podes utilizar a cara para desbloquear este dispositivo. Para obter máis información, ponte en contacto co administrador da túa organización."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utiliza a túa cara para desbloquear o teléfono, autorizar compras e iniciar sesión en aplicacións"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra a cara no círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Facelo máis tarde"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> caras"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cián"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Maxenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Posto que unha aplicación se superpón sobre una solicitude de permiso, a configuración non pode verificar a túa resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se activas <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"É necesario que confirmes o teu PIN xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"É necesario que confirmes o teu contrasinal xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> solicita poder controlar totalmente este dispositivo. O servizo pode ler a pantalla e actuar en nome dos usuarios con necesidades de accesibilidade. Este nivel de control non é adecuado para a maioría das aplicacións."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Queres deter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ao tocar Aceptar deterase <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ningún servizo instalado"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Non hai ningún servizo seleccionado"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ningunha descrición fornecida."</string>
@@ -2327,9 +2354,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta aplicación poderá utilizar a batería en segundo plano, de tal modo que esta última pódese esgotar antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Quitar"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"As túas aplicacións consomen unha cantidade normal de batería. Se consomen demasiada, o teu teléfono suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"As túas aplicacións consomen unha cantidade normal de batería. Se consomen demasiada, a túa tableta suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"As túas aplicacións consomen unha cantidade normal de batería. Se consomen demasiada, o teu dispositivo suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"As túas aplicacións consomen unha cantidade normal de batería. Cando consuman demasiada, o teu teléfono suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"As túas aplicacións consomen unha cantidade normal de batería. Cando consuman demasiada, a túa tableta suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"As túas aplicacións consomen unha cantidade normal de batería. Cando consuman demasiada, o teu dispositivo suxerirá as accións que podes levar a cabo.\n\nSe tes pouca batería, sempre podes activar a función Aforro de batería."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Xestor de batería"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Xestionar aplicacións automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita o uso de batería das aplicacións que utilizas con pouca frecuencia"</string>
@@ -2439,7 +2466,7 @@
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
     <string name="battery_full_charge_last" msgid="8892335687734288031">"Duración aproximada da carga completa"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Os datos da utilización da batería son aproximados e poden cambiar en función do uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Os datos da utilización da batería son aproximados e poden cambiar en función do uso."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"En uso activo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da batería"</string>
@@ -2460,7 +2487,7 @@
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"Activar automaticamente"</string>
     <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"Sen planificación"</string>
     <string name="battery_saver_auto_routine" msgid="8076053160450346731">"Baseada na túa rutina"</string>
-    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Baseada na porcentaxe"</string>
+    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Baseada nunha porcentaxe"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"A función Aforro de batería actívase se se prevé que a batería pode esgotarse antes da seguinte carga. Esta estimación realízase a partir da rutina que segues habitualmente"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"Activarase cando a batería estea ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Establecer unha planificación"</string>
@@ -2943,7 +2970,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Nun terminal de Tocar e pagar, paga con:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Pago no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configura unha aplicación de pago. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"De acordo"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Entendido"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Máis..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Establecer como preferencia?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"Usas sempre <xliff:g id="APP">%1$s</xliff:g> coa opción de Tocar e pagar?"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar a modo Non molestar"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pon en pausa as notificacións para concentrarte"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función non está dispoñible neste dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esta función non está dispoñible"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Esta función reducirá a velocidade do teléfono"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar medicións completas de GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Realiza un seguimento de todas as frecuencias e constelacións de satélites de GNSS sen ciclos"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir inicio de actividades en segundo plano"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 281ea7a..22d2c87 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ચહેરો ઉમેર્યો"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ચહેરા પ્રમાણીકરણના સેટ અપ માટે ટૅપ કરો"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ચહેરા પ્રમાણીકરણ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ઍક્સેસિબિલિટી સેટઅપનો ઉપયોગ કરો"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપમાં સાઇન ઇન કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદીઓને મંજૂર કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારા ચહેરાનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપમાં સાઇન ઇન કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"તમારા ચહેરાને વર્તુળના કેન્દ્રમાં રાખો"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"થોડા સમય પછી નોંધણી કરો"</string>
     <string name="face_add_max" msgid="4408683751143942949">"તમે <xliff:g id="COUNT">%d</xliff:g> ચહેરા સુધી ઉમેરી શકો છો"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"વાદળી"</string>
     <string name="color_yellow" msgid="9112680561610873529">"પીળો"</string>
     <string name="color_magenta" msgid="5059212823607815549">"મજેન્ટા"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>નો ઉપયોગ કરીએ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>ને આની જરૂર છે:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"એક ઍપ્લિકેશન પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ્સ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"જો તમે <xliff:g id="SERVICE">%1$s</xliff:g> ચાલુ કરો છો, તો તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પિનની પુષ્ટિ કરવાની જરૂર છે."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પાસવર્ડની પુષ્ટિ કરવાની જરૂર છે."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> આ ડિવાઇસના સંપૂર્ણ નિયંત્રણ માટે વિનંતી કરે છે. સેવા ઍક્સેસિબિલિટીની જરૂર હોય તેવા વપરાશકર્તા વતી સ્ક્રીન વાંચીને કાર્ય કરી શકે છે. મોટાભાગની ઍપ માટે આ લેવલનું નિયંત્રણ યોગ્ય નથી."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> બંધ કરીએ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"\"ઓકે\" પર ટૅપ કરવાથી <xliff:g id="SERVICE">%1$s</xliff:g> બંધ થશે."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"કોઈ સેવાઓ ઇન્સ્ટોલ કરેલી નથી"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"કોઈ સેવા પસંદ કરેલી નથી"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"કોઈ વર્ણન પ્રદાન કરવામાં આવેલ નથી."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"ખલેલ પાડશો નહીંને અપડેટ કરો"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ધ્યાન કેન્દ્રિત કરવા માટે નોટિફિકેશન થોભાવો"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"આ સુવિધા ઉપલબ્ધ નથી"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"તે તમારા ફોનની કાર્ય કરવાની ગતિ ધીમી કરશે"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"બૅકગ્રાઉન્ડ પ્રવૃત્તિ શરૂ કરવાની પરવાનગી આપો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5e1b344..d7f3da1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"चेहरा जोड़ा गया"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"टैप करके \'चेहरे से अनलॉक\' सेट अप करें"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"चेहरे से अनलॉक करें"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"सुलभता सेटअप का इस्तेमाल करें"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"अपने फ़ोन को अनलॉक करने, खरीदारी की मंज़ूरी देने या ऐप्लिकेशन में साइन इन करने के लिए अपने चेहरे का इस्तेमाल करें."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"फ़ोन का लॉक खोलने या खरीदारियों को मंज़ूरी देने के लिए चेहरे की पहचान इस्तेमाल करें.\n\nध्यान दें: इस डिवाइस का लॉक खोलने के लिए आप अपने चेहरे का इस्तेमाल नहीं कर सकते. ज़्यादा जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"अपने फ़ोन को अनलॉक करने, खरीदारी की मंज़ूरी देने या ऐप्लिकेशन में साइन इन करने के लिए अपने चेहरे का इस्तेमाल करें"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"चेहरे को गोल घेरे के बीचों-बीच लाएं"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"बाद में करें"</string>
     <string name="face_add_max" msgid="4408683751143942949">"आप ज़्यादा से ज़्यादा <xliff:g id="COUNT">%d</xliff:g> चेहरे जोड़ सकते हैं"</string>
@@ -421,27 +428,17 @@
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"चेहरा रजिस्टर नहीं हो पाया."</string>
     <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"हो गया. सब ठीक लग रहा है."</string>
     <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"हो गया"</string>
-    <!-- no translation found for security_settings_face_settings_use_face_category (4087133372842623883) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_use_face_unlock_phone (8780794239930621913) -->
-    <skip />
+    <string name="security_settings_face_settings_use_face_category" msgid="4087133372842623883">"इसके लिए \'चेहरा पहचानकर अनलॉक करना\' इस्तेमाल करें"</string>
+    <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8780794239930621913">"फ़ाेन अनलॉक हाे रहा"</string>
     <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ऐप्लिकेशन साइन इन और भुगतान"</string>
-    <!-- no translation found for security_settings_face_settings_require_category (2643852178287575557) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_require_attention (1891157027896989860) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_require_attention_details (6063278991544881786) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_require_confirmation (3555852478589689141) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_require_confirmation_details (7965662696468917986) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_remove_face_data (304401377141467791) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_enroll (664990192460698660) -->
-    <skip />
-    <!-- no translation found for security_settings_face_settings_footer (7769500154351757004) -->
-    <skip />
+    <string name="security_settings_face_settings_require_category" msgid="2643852178287575557">"चेहरा पहचानकर डिवाइस अनलॉक करने की सुविधा के लिए ज़रूरी है"</string>
+    <string name="security_settings_face_settings_require_attention" msgid="1891157027896989860">"स्क्रीन काे आंखें खाेलकर देखना"</string>
+    <string name="security_settings_face_settings_require_attention_details" msgid="6063278991544881786">"फ़ाेन अनलॉक करने के लिए, स्क्रीन खुली आंखाें से देखना ज़रूरी है"</string>
+    <string name="security_settings_face_settings_require_confirmation" msgid="3555852478589689141">"\'पुष्टि करें\' बटन"</string>
+    <string name="security_settings_face_settings_require_confirmation_details" msgid="7965662696468917986">"ऐप्लिकेशन में प्रमाणित करते समय हमेशा पुष्टि करना ज़रूरी है"</string>
+    <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"चेहरे का डेटा मिटाएं"</string>
+    <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"नया चेहरा पहचानकर अनलॉक करना सेट अप करें"</string>
+    <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"अपना डिवाइस अनलॉक करने के लिए, चेहरा पहचानकर डिवाइस अनलॉक करने की सुविधा इस्तेमाल करें. ऐप्लिकेशन में साइन इन करें और भुगतानाें की पुष्टि करें.\n\nये बातें ध्यान रखें:\nफ़ोन की ओर देखने पर वह अनलॉक हो जाएगा, भले ही आप ऐसा न करना चाहते हों.\n\nआपकी आंखें खुली होने पर कोई और भी आपके फ़ोन को आपके चेहरे की ओर दिखाकर अनलॉक कर सकता है.\n\nशायद आपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर ले जिसकी शक्ल आपसे काफ़ी मिलती हो, जैसे आपके बच्चे या जुड़वां भाई-बहन."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"चेहरे से जुड़ा डेटा मिटाएं?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="2609671025686003946">"चेहरे की पहचान करके डिवाइस को अनलॉक करने की सुविधा के ज़रिए रिकॉर्ड किया गया डेटा हमेशा के लिए और सुरक्षित रूप से मिटा दिया जाएगा. मिटाने के बाद अपने फ़ोन को अनलॉक करने, ऐप्लिकेशन में साइन इन करने और भुगतान की पुष्टि करने के लिए आपको पिन, पैटर्न या पासवर्ड की ज़रूरत होगी."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"उंगली की छाप"</string>
@@ -491,18 +488,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"इसे बाद में करें"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. अगर आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में करीब एक मिनट लगता है."</string>
-    <!-- no translation found for fingerprint_lock_screen_setup_skip_dialog_text (7914950545902198894) -->
-    <skip />
-    <!-- no translation found for fingerprint_lock_screen_setup_skip_dialog_text (2300047476104528001) -->
-    <skip />
-    <!-- no translation found for fingerprint_lock_screen_setup_skip_dialog_text (5823994499768751994) -->
-    <skip />
-    <!-- no translation found for face_lock_screen_setup_skip_dialog_text (4490601819500843860) -->
-    <skip />
-    <!-- no translation found for face_lock_screen_setup_skip_dialog_text (3741624920522374098) -->
-    <skip />
-    <!-- no translation found for face_lock_screen_setup_skip_dialog_text (3523360900206227082) -->
-    <skip />
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7914950545902198894">"अपने टैबलेट को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="2300047476104528001">"अपने डिवाइस को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="5823994499768751994">"अपने फ़ोन को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="4490601819500843860">"अपने टैबलेट को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="3741624920522374098">"अपने डिवाइस को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="3523360900206227082">"अपने फ़ोन को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें, फिर एक पिन, पैटर्न या पासवर्ड सेट करें."</string>
     <string name="lock_screen_pin_skip_title" msgid="8064328201816780457">"पिन अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_password_skip_title" msgid="4155009417576409182">"पासवर्ड अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="6467327818577283960">"पैटर्न अभी सेट अप नहीं करना चाहते?"</string>
@@ -795,8 +786,7 @@
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"आपका फ़ोन अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"आपका टैबलेट अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"आपका डिवाइस अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
-    <!-- no translation found for bluetooth_untethered_unpair_dialog_body (5932168717642676140) -->
-    <skip />
+    <string name="bluetooth_untethered_unpair_dialog_body" msgid="5932168717642676140">"इस खाते से लिंक काेई भी डिवाइस अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ जुड़ा नहीं रहेगा"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"डिवाइस को भूल जाएं"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मीडिया ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
@@ -1043,7 +1033,10 @@
       <item quantity="one">%d सदस्यताएं</item>
       <item quantity="other">%d सदस्यताएं</item>
     </plurals>
-    <!-- no translation found for wifi_saved_all_access_points_summary (2504425359919617586) -->
+    <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="2504425359919617586">
+      <item quantity="one">%d नेटवर्क और सदस्यताएं</item>
+      <item quantity="other">%d नेटवर्क और सदस्यताएं</item>
+    </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"बेहतर वाई-फ़ाई"</string>
     <string name="wifi_advanced_ssid_title" msgid="1552309166043760291">"एसएसआईडी"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
@@ -1265,10 +1258,8 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"वॉलपेपर बदलें"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"अपनी स्क्रीन को अपने मुताबिक बनाएं"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
-    <!-- no translation found for style_suggestion_title (4710867417147087928) -->
-    <skip />
-    <!-- no translation found for style_suggestion_summary (4592087484229499188) -->
-    <skip />
+    <string name="style_suggestion_title" msgid="4710867417147087928">"Pixel काे पसंद के मुताबिक बनाएं"</string>
+    <string name="style_suggestion_summary" msgid="4592087484229499188">"अलग-अलग स्टाइल, वॉलपेपर, घड़ी और दूसरी चीज़ें आज़माएं"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"स्क्रीन सेवर"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"चार्ज होते समय या डॉक किए होने पर"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"कोई एक"</string>
@@ -1675,8 +1666,8 @@
     <string name="location_app_level_permissions" msgid="2777033567595680764">"ऐप्लिकेशन की अनुमति"</string>
     <string name="location_app_permission_summary_location_off" msgid="2790918244874943070">"जगह की जानकारी बंद है"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="5336807018727349708">
-      <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकरी का एक्सेस है</item>
-      <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकरी का एक्सेस है</item>
+      <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का एक्सेस है</item>
+      <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का एक्सेस है</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="4911449278675337490">"हाल ही में एक्सेस की गई जगह की जानकारी"</string>
     <string name="location_recent_location_access_view_details" msgid="1955078513330927035">"जानकारी देखें"</string>
@@ -2117,12 +2108,10 @@
     <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"कर्सर रुकने की अवधि"</string>
     <string name="accessibility_autoclick_description" msgid="4908960598910896933">"अगर आप माउस इस्तेमाल कर रहे हैं तो, सेट कर सकते हैं कि किसी जगह पर एक तय समय तक रुकने के बाद कर्सर अपने आप कार्रवाई करे."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
-    <!-- no translation found for accessibility_vibration_settings_title (3196059463767462026) -->
-    <skip />
+    <string name="accessibility_vibration_settings_title" msgid="3196059463767462026">"वाइब्रेशन और हैप्टिक तीव्रता"</string>
     <string name="accessibility_notification_vibration_title" msgid="3009997451790678444">"सूचना के लिए वाइब्रेशन"</string>
     <string name="accessibility_ring_vibration_title" msgid="5369395955680650778">"घंटी के लिए वाइब्रेशन"</string>
-    <!-- no translation found for accessibility_touch_vibration_title (3548641513105226156) -->
-    <skip />
+    <string name="accessibility_touch_vibration_title" msgid="3548641513105226156">"टच फ़ीडबैक"</string>
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सेवा इस्तेमाल करें"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"कैप्शन इस्तेमाल करें"</string>
@@ -2205,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"हरिताभ नीला"</string>
     <string name="color_yellow" msgid="9112680561610873529">"पीला"</string>
     <string name="color_magenta" msgid="5059212823607815549">"मैजेंटा"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह ज़रूरी है:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
@@ -2214,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> इस डिवाइस पर पूरा नियंत्रण मांग रहा है. यह सेवा, स्क्रीन पर दिख रही जानकारी पढ़ सकती है और सुलभता से जुड़ी ज़रूरतों वाले उपयोगकर्ताओं की तरफ़ से काम कर सकती है. नियंत्रण का यह लेवल ज़्यादातर ऐप्लिकेशन के लिए सही नहीं है."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"\'ठीक है\' पर टैप करने से <xliff:g id="SERVICE">%1$s</xliff:g> सुविधा बंद हो जाएगी."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"कोई सेवा नहीं चुनी गई"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
@@ -2611,12 +2620,10 @@
     <string name="add_device_admin" msgid="4192055385312215731">"इस डिवाइस एडमिन ऐप्लिकेशन को चालू करें"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"डिवाइस व्यवस्थापक"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"इस एडमिन ऐप्लिकेशन को चालू करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को ये काम करने की अनुमति मिल जाएगी:"</string>
-    <!-- no translation found for device_admin_warning_simplified (8085544856342321981) -->
-    <skip />
+    <string name="device_admin_warning_simplified" msgid="8085544856342321981">"इस डिवाइस काे <xliff:g id="APP_NAME">%1$s</xliff:g> प्रबंधित और मॉनिटर करेगा."</string>
     <string name="device_admin_status" msgid="7234814785374977990">"यह एडमिन ऐप्लिकेशन चालू है और <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को नीचे दिए गए काम करने देता है:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"क्या प्रोफ़ाइल मैनेजर को चालू करना है?"</string>
-    <!-- no translation found for profile_owner_add_title_simplified (6856400286736117006) -->
-    <skip />
+    <string name="profile_owner_add_title_simplified" msgid="6856400286736117006">"निगरानी करने की मंज़ूरी देना चाहते हैं?"</string>
     <string name="adding_profile_owner_warning" msgid="1354474524852805802">"अगर आप आगे बढ़ते हैं, तो आपके उपयोगकर्ता का प्रबंधन आपका एडमिन करेगा जो आपके निजी डेटा के अलावा, उससे जुड़ा हुआ डेटा भी इकट्ठा कर सकता है.\n\nआपका एडमिन इस उपयोगकर्ता की सेटिंग, पहुंच, ऐप्लिकेशन और इससे जुड़े डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिसमें नेटवर्क गतिविधि और आपके डिवाइस के जगह की जानकारी शामिल है."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"आपके व्यवस्थापक ने दूसरे विकल्पों को अक्षम किया हुआ है"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"ज़्यादा विवरण"</string>
@@ -2769,8 +2776,7 @@
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"बिल किए गए वाई-फ़ाई नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"बिल किए जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
     <string name="data_usage_metered_auto" msgid="1262028400911918865">"ऑटोमैटिक"</string>
-    <!-- no translation found for wifi_metered_title (5536703738895222444) -->
-    <skip />
+    <string name="wifi_metered_title" msgid="5536703738895222444">"नेटवर्क इस्तेमाल"</string>
     <string name="data_usage_metered_yes" msgid="9217539611385225894">"बिल किया गया"</string>
     <string name="data_usage_metered_no" msgid="4025232961929071789">"बिल नहीं किया गया"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
@@ -3340,8 +3346,7 @@
     <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"पिछले 7 दिनों में इस्तेमाल किए गए सभी ऐप्लिकेशन देखें"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"बेहतर"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"वर्क प्रोफ़ाइल सूचनाएं"</string>
-    <!-- no translation found for smart_notifications_title (3702411478231865970) -->
-    <skip />
+    <string name="smart_notifications_title" msgid="3702411478231865970">"ज़रूरत के हिसाब से सूचनाएं"</string>
     <string name="asst_capability_prioritizer_title" msgid="6691908606916292167">"ज़रूरी सूचनाएं अपने आप तय होने के लिए सेट करें"</string>
     <string name="asst_capability_prioritizer_summary" msgid="7553129095829077229">"कम ज़रूरी सूचनाओं को बिना आवाज़ वाली सूचनाओं के तौर पर अपने आप सेट करें"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="8621608733904251499">"सुझाई गई कार्रवाइयां और जवाब"</string>
@@ -3404,16 +3409,11 @@
     <string name="allow_interruption" msgid="7136150018111848721">"रुकावटों की अनुमति दें"</string>
     <string name="allow_interruption_summary" msgid="7870159391333957050">"ऐप को आवाज़, थरथराहट (वाइब्रेशन) करने दें और/या स्क्रीन पर सूचना नई विंडो में खुलने दें"</string>
     <string name="notification_channel_summary_min" msgid="2965790706738495761">"नीचे खींचने वाली सूची में, सूचनाओं को एक लाइन तक छोटा करें"</string>
-    <!-- no translation found for notification_channel_summary_low (7875385321253491191) -->
-    <skip />
-    <!-- no translation found for notification_channel_summary_low_status (7866565328564018007) -->
-    <skip />
-    <!-- no translation found for notification_channel_summary_low_lock (4009247523075328235) -->
-    <skip />
-    <!-- no translation found for notification_channel_summary_low_status_lock (3668028634045057230) -->
-    <skip />
-    <!-- no translation found for notification_channel_summary_default (4618537204284469990) -->
-    <skip />
+    <string name="notification_channel_summary_low" msgid="7875385321253491191">"सिर्फ़ नीचे खिंचने वाली सूची में सूचनाएं दिखती हैं ताकि आप उन पर पूरा ध्यान दे सकें. दिखते समय आवाज़ और वाइब्रेशन हमेशा बंद रहते हैं."</string>
+    <string name="notification_channel_summary_low_status" msgid="7866565328564018007">"कम ज़रूरी सूचनाएं दिखती हैं. दिखते समय आवाज़ और वाइब्रेशन हमेशा बंद रहते हैं."</string>
+    <string name="notification_channel_summary_low_lock" msgid="4009247523075328235">"कम ज़रूरी सूचनाएं दिखती हैं. दिखते समय आवाज़ और वाइब्रेशन हमेशा बंद रहते हैं."</string>
+    <string name="notification_channel_summary_low_status_lock" msgid="3668028634045057230">"कम ज़रूरी सूचनाएं दिखती हैं. दिखते समय आवाज़ और वाइब्रेशन हमेशा बंद रहते हैं."</string>
+    <string name="notification_channel_summary_default" msgid="4618537204284469990">"आवाज़ और स्टेटस बार के आइकॉन की मदद से सूचनाओं पर आपका ध्यान खिंचता है. लॉक स्क्रीन पर दिखाई देता है."</string>
     <string name="notification_channel_summary_high" msgid="7737315941884569891">"जब डिवाइस अनलॉक हो, तो स्क्रीन के सबसे ऊपर बैनर के रूप में सूचनाएं दिखाएं"</string>
     <string name="notification_switch_label" msgid="6843075654538931025">"सूचनाएं दिखाएं"</string>
     <string name="default_notification_assistant" msgid="8441022088918117445">"ज़रूरत के हिसाब से सूचनाएं"</string>
@@ -4340,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'परेशान न करें सुविधा\' अपडेट करें"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ध्यान भटकने से रोकने के लिए डिवाइस की सूचनाओं को कुछ समय के लिए रोकें"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"यह सुविधा मौजूद नहीं है"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"इस सुविधा का इस्तेमाल करने पर आपका फ़ोन धीरे काम करेगा"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"जीएनएसएस माप को हर हाल में लागू करें"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"बिना ड्यूटी-साइक्लिंग के जीएनएसएस के सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"बैकग्राउंड में गतिविधि शुरू होने की मंज़ूरी दें"</string>
@@ -4573,10 +4575,8 @@
     <string name="wfc_disclaimer_location_title_text" msgid="6658735446562619865">"जगह"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="3096546236221656018">"इस सेवा को उपलब्ध कराने के लिए मोबाइल नेटवर्क की सुविधा उपलब्ध कराने वाली कंपनी आपकी जगह की जानकारी इकट्ठा कर सकती है.\n\nकृपया कंपनी की निजता नीति को ध्यान से पढ़ें."</string>
     <string name="forget_passpoint_dialog_message" msgid="7331876195857622224">"आप बचे हुए समय या डेटा का एक्सेस खो सकते हैं. हटाने से पहले अपनी सेवा देने वाली कंपनी से पुष्टि कर लें."</string>
-    <!-- no translation found for keywords_content_capture (8252675452668954083) -->
-    <skip />
-    <!-- no translation found for content_capture (3210232615756364639) -->
-    <skip />
+    <string name="keywords_content_capture" msgid="8252675452668954083">"सामग्री कैप्चर, ऐप्लिकेशन की सामग्री"</string>
+    <string name="content_capture" msgid="3210232615756364639">"ऐप्लिकेशन की सामग्री"</string>
     <string name="content_capture_summary" msgid="659506647507221852">"ऐप्लिकेशन को Android सिस्टम में सामग्री भेजने की अनुमति देता है"</string>
     <string name="capture_system_heap_dump_title" msgid="8043655498113164693">"सिस्टम हीप डंप कैप्चर करें"</string>
     <string name="capturing_system_heap_dump_message" msgid="8680086369500395131">"सिस्टम हीप डंप कैप्चर किया जा रहा है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3903a5f..4a5e4bd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -389,7 +389,7 @@
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Telefon nije kriptiran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Uređaj je kriptiran"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Uređaj nije kriptiran"</string>
-    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Prikaz zaključanog zaslona"</string>
+    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Na zaključanom zaslonu"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Što prikazati"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Dodirnite za postavljanje autent. licem"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autentifikacija licem"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Koristi postav. za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Licem možete otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Otključajte telefon ili odobrite kupnje svojim licem.\n\nNapomena: ovaj uređaj ne možete otključati licem. Za više informacija obratite se administratoru organizacije."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Licem možete otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Postavite lice u središte kruga"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Učinit ću to kasnije"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Ne možete dodati više od <xliff:g id="COUNT">%d</xliff:g> lica"</string>
@@ -1370,9 +1377,9 @@
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRL verzija"</string>
     <string name="meid_multi_sim" msgid="748999971744491771">"MEID (utor za SIM %1$d)"</string>
-    <string name="scanning_status_text_wifi_on_ble_on" msgid="5262263689045962681">"Uključeno je pretraživanje Wi‑Fija i Bluetootha"</string>
-    <string name="scanning_status_text_wifi_on_ble_off" msgid="2115399719199757550">"Pretraživanje Wi‑Fija je uključeno, a Bluetootha isključeno"</string>
-    <string name="scanning_status_text_wifi_off_ble_on" msgid="3212656150021004088">"Pretraživanje Bluetootha je uključeno, a Wi‑Fija isključeno"</string>
+    <string name="scanning_status_text_wifi_on_ble_on" msgid="5262263689045962681">"Uključeno je traženje Wi‑Fija i Bluetootha"</string>
+    <string name="scanning_status_text_wifi_on_ble_off" msgid="2115399719199757550">"Traženje Wi‑Fija uključeno, a Bluetootha isključeno"</string>
+    <string name="scanning_status_text_wifi_off_ble_on" msgid="3212656150021004088">"Traženje Bluetootha uključeno, a Wi‑Fija isključeno"</string>
     <string name="scanning_status_text_wifi_off_ble_off" msgid="6381094990708345188">"Isključeno je pretraživanje Wi‑Fija i Bluetootha"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Grimizna"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba sljedeće:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Budući da aplikacija prekriva zahtjev za dopuštenje, Postavke ne mogu potvrditi vaš odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi zaporku."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> zahtijeva punu kontrolu nad ovim uređajem. Ta usluga može čitati zaslon i postupati u ime korisnika kojima je potrebna prilagođena pristupačnost. Ta razina kontrole nije primjerena za većinu aplikacija."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ako dodirnete \"U redu\", zaustavit će se <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nije odabrana nijedna usluga"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
@@ -3263,7 +3290,7 @@
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Vidjet ćete obavijesti na zaslonu"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kada obavijesti stignu, telefon neće davati zvučne signale niti vibrirati."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bez vizualnih i zvučnih signala obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Obavijesti se neće prikazivati niti davati zvučne signale"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Obavijesti se neće prikazivati niti će se čuti zvučni signali"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Telefon neće prikazati nove ili postojeće obavijesti niti će za njih vibrirati ili zvoniti. No ključne obavijesti koje se odnose na aktivnost i status telefona i dalje će se prikazivati.\n\nKada isključite način \"Ne uznemiravaj\", propuštene obavijesti pronaći ćete tako da prijeđete od vrha zaslona prema dolje."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođenu postavku"</string>
@@ -3342,7 +3369,7 @@
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Postavke"</string>
     <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bez vizualnih i zvučnih signala obavijesti"</string>
     <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bez zvuka obavijesti"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Obavijesti se neće prikazivati niti davati zvučne signale. Dopušteni su pozivi kontakata označenih zvjezdicom i ponovnih pozivatelja."</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Obavijesti se neće prikazivati niti će se čuti zvučni signali. Dopušteni su pozivi kontakata označenih zvjezdicom i ponovnih pozivatelja."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Trenutačna postavka)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Želite li promijeniti postavke obavijesti za način Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
@@ -3387,20 +3414,20 @@
     <string name="gentle_notifications_title" msgid="3976374971153475110">"Neupadljive obavijesti"</string>
     <string name="gentle_notifications_also_display" msgid="6455360420411828133">"Prikaži i na"</string>
     <string name="gentle_notifications_display_status" msgid="2904115658980383410">"Traka statusa"</string>
-    <string name="gentle_notifications_display_lock" msgid="1395567209329239992">"Zaključan zaslon"</string>
+    <string name="gentle_notifications_display_lock" msgid="1395567209329239992">"Na zaključanom zaslonu"</string>
     <string name="gentle_notifications_education" msgid="8713358646047345762">"Neupadljive obavijesti uvijek su bešumne i uvijek se prikazuju na zaslonu obavijesti"</string>
     <string name="gentle_notifications_display_summary_shade" msgid="6583107817329430916">"Prikaži samo na zaslonu obavijesti"</string>
     <string name="gentle_notifications_display_summary_shade_lock" msgid="1434426811760016414">"Prikaži na zaslonu obavijesti i zaključanom zaslonu"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="6113566548809874319">"Prikaži na zaslonu obavijesti i traci statusa"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="4222628772925544654">"Prikaži na zaslonu obavijesti, traci statusa i zaključanom zaslonu"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Trepereće svjetlo"</string>
-    <string name="lock_screen_notifications_title" msgid="7604704224172951090">"Zaključaj zaslon"</string>
+    <string name="lock_screen_notifications_title" msgid="7604704224172951090">"Na zaključanom zaslonu"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Kad je radni profil zaključan"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="1133085507139112569">"Prikaži osjetljiv sadržaj samo kad je otključano"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Uopće ne prikazuj obavijesti"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="3143593517597479937">"Kako želite da se prikazuje zaključan zaslon?"</string>
-    <string name="lock_screen_notifications_interstitial_title" msgid="709573564312902481">"Zaključaj zaslon"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="709573564312902481">"Na zaključanom zaslonu"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Prikaži sav sadržaj obavijesti radnog profila"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2005907007779384635">"Sakrij osjetljiv sadržaj s posla"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako želite da se prikazuju obavijesti profila kada je uređaj zaključan?"</string>
@@ -3514,7 +3541,7 @@
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikaži točku obavijesti"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Dopusti obavijesti u načinu Ne ometaj kad je postavljen na \"Samo prioritetno\""</string>
-    <string name="app_notification_visibility_override_title" msgid="3618860781666494595">"Zaključaj zaslon"</string>
+    <string name="app_notification_visibility_override_title" msgid="3618860781666494595">"Na zaključanom zaslonu"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
@@ -3560,7 +3587,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Svaki dan"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Alarm može nadjačati vrijeme završetka"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="1673667979187593693">"Raspored se isključuje kad se oglasi alarm"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Ponašanje načina Ne uznemiravaj"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Način Ne uznemiravaj"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"Upotrijebi zadane postavke"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"Izradite prilagođene postavke za ovaj raspored"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"Za \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\""</string>
@@ -4231,11 +4258,11 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Da biste promijenili aplikaciju, prijeđite prstom prema gore po gumbu početnog zaslona. Ponovo prijeđite prstom prema gore da biste vidjeli sve aplikacije. Funkcionira na svim zaslonima. Više nećete imati gumb Pregled u donjem desnom kutu zaslona."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Isprobajte novi gumb početnog zaslona"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Uključite novi pokret da biste promijenili aplikaciju"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite da biste provjerili telefon"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dva dodira za provjeru"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite da biste provjerili uređaj"</string>
     <string name="ambient_display_summary" msgid="8534654210539169707">"Da biste pogledali vrijeme, obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podizanje telefona za provjeru"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za pregled"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
     <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Probudite zaslon"</string>
@@ -4369,7 +4396,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišteni prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Automatsko popunjavanje"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Provjerite je li ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
     <string name="debug_autofill_category" msgid="8050326960545979035">"Automatski popuni"</string>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažuriranje načina Ne uznemiravaj"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavijesti da biste ostali usredotočeni"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ova značajka nije dostupna"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ovo će usporiti telefon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Primijeni potpuna mjerenja GNSS-a"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Dopusti pokretanje pozadinskih aktivnosti"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 937dd7f..5c0228d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Arc hozzáadva"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Koppintson az arcfelismerés megadásához"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Arcfelismerés"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Kisegítő beállítás használata"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Használja arcát telefonja feloldásához, vásárlások engedélyezéséhez és alkalmazásokba való bejelentkezéshez."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Használja arcát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Nem használhatja arcát az eszköz feloldására. Ha további információra van szüksége, forduljon szervezete rendszergazdájához."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Használja arcát telefonja feloldásához, vásárlások engedélyezéséhez és alkalmazásokba való bejelentkezéshez"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Helyezze arcát a körbe"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Később"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> arcot adhat hozzá"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Zöldeskék"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Sárga"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Használja a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Mivel az egyik alkalmazás zavar egy engedélykérelmet, a Beállítások funkció nem tudja ellenőrizni az Ön válaszát."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ha engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie PIN-kódját."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie jelszavát."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> teljes irányítást kér az eszköz felett. Az alkalmazás felolvashatja a képernyőn lévő tartalmat, és cselekedhet a kisegítő lehetőségekre szoruló felhasználók helyett. Az irányítás ilyen szintje nem megfelelő a legtöbb alkalmazás számára."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Az OK gombra koppintva leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nincs telepített szolgáltatás"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nincs kiválasztott szolgáltatás"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
@@ -2772,7 +2799,7 @@
     <string name="vpn_username" msgid="1863901629860867849">"Felhasználónév"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Jelszó"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Fiók adatainak mentése"</string>
-    <string name="vpn_not_used" msgid="9094191054524660891">"(nem használják)"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nincs használatban)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ne ellenőrizze a szervert)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(szervertől fogadva)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Ez a VPN-típus nem maradhat mindig csatlakoztatva"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"A Ne zavarjanak mód frissítése"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Az összpontosításhoz szüneteltetheti az értesítéseket"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ez a funkció nem áll rendelkezésre ezen az eszközön"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ez a funkció nem áll rendelkezésre."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Használata lelassítaná a telefont."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Teljes GNSS-mérés indítása"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Az összes GNSS-műhold és -frekvencia nyomon követése aktívciklus-szabályozás nélkül"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Háttér-tevékenységek megkezdésének engedélyezése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index af53103..b469d52 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Դեմքն ավելացվեց"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Հպեք՝ դեմքի ճանաչումը կարգավորելու համար"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Դեմքի ճանաչում"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Ցուցադրել հասանելիութ. կարգավոր."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Դեմքի ճանաչման միջոցով ապակողպեք ձեր հեռախոսը, գնումներ կատարեք և մուտք գործեք հավելվածներ:"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Օգտագործեք ձեր դեմքը՝ հեռախոսն ապակողպելու կամ գնումները թույլատրելու համար:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր դեմքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Դեմքի ճանաչման միջոցով ապակողպեք ձեր հեռախոսը, գնումներ կատարեք և մուտք գործեք հավելվածներ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Դեմքը պահեք կենտրոնում"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Ավելի ուշ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Դուք կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> դեմք"</string>
@@ -770,7 +777,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ընդլայնված"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ընդլայնված Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել մոտակայքում գտնվող Bluetooth սարքերի հետ:"</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել մոտակայքում գտնվող Bluetooth սարքերի հետ:\n\nՍարքի աշխատանքը լավացնելու նպատակով հավելվածներն ու ծառայությունները կորոնեն մոտակայքում գտնվող սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատած է: Դա կարող է լավացնել տեղորոշում օգտագործող գործառույթների ու ծառայությունների աշխատանքը։ Այս ընտրանքը կարող եք փոխել "<annotation id="link">"որոնման կարգավորումներում"</annotation>":"</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել մոտակայքում գտնվող Bluetooth սարքերի հետ:\n\nՍարքի աշխատանքը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն մոտակայքում գտնվող սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատած է: Դա կարող է լավացնել տեղորոշում օգտագործող գործառույթների ու ծառայությունների աշխատանքը։ Այս ընտրանքը կարող եք փոխել "<annotation id="link">"որոնման կարգավորումներում"</annotation>":"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Տեղորոշման ճշգրտությունը բարելավելու նպատակով համակարգի հավելվածներն ու ծառայությունները կարող են շարունակել Bluetooth սարքերի հայտնաբերումը: Այս ընտրանքը կարող եք փոխել <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>:"</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Չհաջողվեց կապակցվել: Փորձեք նորից:"</string>
     <string name="device_details_title" msgid="6576953269221085300">"Սարքի տվյալները"</string>
@@ -1237,7 +1244,7 @@
     <string name="night_display_activation_on_manual" msgid="277343561277625826">"Միացնել"</string>
     <string name="night_display_activation_off_manual" msgid="4074557720918572883">"Անջատել"</string>
     <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Միացնել մինչև լուսաբաց"</string>
-    <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Միացնել մինչև մայրամուտ"</string>
+    <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Անջատել մինչև մայրամուտ"</string>
     <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Միացնել մինչև <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Անջատել մինչև <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="6273540991113206401">"Գիշերային ռեժիմը միացված չէ"</string>
@@ -1578,13 +1585,13 @@
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Զրոյացման ընտրանքներ"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ցանցի, հավելվածների և սարքի կարգավորումները հնարավոր է զրոյացնել"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Վերակայել Wi-Fi-ը, բջջային տվյալների կարգավորումները և Bluetooth-ը"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Զրոյացնել Wi-Fi-ի, բջջային թրաֆիկի և Bluetooth-ի կարգավորումները"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Արդյունքում կվերակայվեն բոլոր ցանցային կարգավորումները, ներառյալ հետևյալը՝\n\n"<li>"Wi‑Fi"</li>\n<li>"Բջջային ինտերնետ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="1979762943163078939">"Ջնջել ներբեռնված SIM-երը"</string>
     <string name="reset_esim_desc" msgid="5940105242448544634">"Նոր SIM քարտ ներբեռնելու համար դիմեք ձեր օպերատորին։ Բջջային կապի սակագնային պլանները չեն չեղարկվի:"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Զրոյացնել կարգավորումները"</string>
-    <string name="reset_network_final_desc" msgid="4690205209934596665">"Վերակայե՞լ ցանցի բոլոր կարգավորումները: Այս գործողությունը հնարավոր չի լինի հետարկել:"</string>
-    <string name="reset_network_final_desc_esim" msgid="6641433458865914227">"Վերակայե՞լ ցանցի բոլոր կարգավորումները և ջնջել ներբեռնված SIM քարտերի տվյալները։ Այս գործողությունը չեք կարող հետարկել:"</string>
+    <string name="reset_network_final_desc" msgid="4690205209934596665">"Զրոյացնե՞լ ցանցի բոլոր կարգավորումները: Այս գործողությունը հնարավոր չի լինի հետարկել:"</string>
+    <string name="reset_network_final_desc_esim" msgid="6641433458865914227">"Զրոյացնե՞լ ցանցի բոլոր կարգավորումները և ջնջել ներբեռնված SIM քարտերի տվյալները։ Այս գործողությունը չեք կարող հետարկել:"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Զրոյացնել կարգավորումները"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Վերակայե՞լ:"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ցանցի վերակայումը հասանելի չէ այս օգտատիրոջ"</string>
@@ -1852,7 +1859,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Ցույց տալ ընթացիկ ծառայությունները"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Ցուցադրել քեշավորված գործընթացները"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Արտակարգ իրավիճակների հավելված"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Զրոյացնել կարգավորումները"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Զրոյացնել հավելվածների կարգավորումները"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Զրոյացնե՞լ կարգավորումները"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Կզրոյանան հետևյալ բոլոր կարգավորումները՝\n\n "<li>"Անջատած հավելվածները"</li>\n" "<li>"Հավելվածների անջատած ծանուցումները"</li>\n" "<li>"Կանխադրված հավելվածները"</li>\n" "<li>"Ֆոնային ռեժիմում տվյալների փոխանցման սահմանափակումները"</li>\n\n" "<li>"Թույլտվությունների բոլոր սահմանափակումները"</li>\n"Հավելվածների տվյալները չեն կորի։"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Զրոյացնել"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Երկնագույն"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Դեղին"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Մանուշակագույն"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ին անհրաժեշտ է`"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Եթե ​​միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների գաղտնագրումը լավացնելու համար:"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր PIN-ը:"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր գաղտնաբառը:"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը այս սարքն ամբողջությամբ վերահսկելու թույլտվություն է ուզում: Ծառայությունը կարող է կարդալ էկրանի տվյալները և գործել այն օգտատերերի անունից, որոնց հատուկ գործառույթներ են անհրաժեշտ: Հասանելիության այս մակարդակը նախատեսված չէ հավելվածների մեծամասնության համար:"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Դադարեցնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Հաստատեք, որ ուզում եք դադարեցնել <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը։"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Տեղադրված ծառայաթյուններ չկան"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ընտրված ծառայություն չկա"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Որևէ նկարագրություն չկա:"</string>
@@ -3236,7 +3263,7 @@
     <string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Չմիացնել թարթող լույսը"</string>
     <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Չցուցադրել էկրանին հայտնվող ծանուցումներ"</string>
     <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Թաքցնել կարգավիճակի գոտու պատկերակները էկրանի վերևից"</string>
-    <string name="zen_mode_block_effect_badge" msgid="214553506070597320">"Թաքցնել ծանուցումների կետիկները հավելվածների պատկերակներից"</string>
+    <string name="zen_mode_block_effect_badge" msgid="214553506070597320">"Թաքցնել ծանուց․ կետիկները հավելվ․ պատկերակներից"</string>
     <string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"Ցույց չտալ ծանուցումները"</string>
     <string name="zen_mode_block_effect_list" msgid="4722887783222298295">"Թաքցնել իջնող վահանակից"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="2617875282623486256">"Երբեք"</string>
@@ -3537,7 +3564,7 @@
     <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Միայն կրկնվող զանգեր"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ ոքից"</string>
     <string name="zen_mode_from_none_calls" msgid="7705112158761351044">"Արգելափակել զանգերը"</string>
-    <string name="zen_mode_from_none_messages" msgid="3300937656725582608">"Արգելափակել հաղորդագրությունները"</string>
+    <string name="zen_mode_from_none_messages" msgid="3300937656725582608">"Չթույլատրել"</string>
     <string name="zen_mode_alarms" msgid="6510378757005935647">"Թույլատրել զարթուցիչը"</string>
     <string name="zen_mode_alarms_list" msgid="1090332840207025714">"զարթուցիչներ"</string>
     <string name="zen_mode_media" msgid="4529187475698084320">"Նվագարկել մեդիայի ձայները"</string>
@@ -3705,7 +3732,7 @@
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Օգնական և ձայնային ներածում"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Օգնական հավելված"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Սահմանե՞լ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> հավելվածը որպես օգնական:"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"Օգնականը կարողանալու է կարդալ համակարգում աշխատեցվող հավելվածների վերաբերյալ տեղեկությունները, այդ թվում նաև էկրանին ցուցադրվող կամ հավելվածներից ստացվող տեղեկությունները:"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"Օգնականը կարողանալու է կարդալ համակարգում աշխատող հավելվածների վերաբերյալ տեղեկությունները, այդ թվում նաև էկրանին ցուցադրվող կամ հավելվածներից ստացվող տեղեկությունները:"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Ընդունել"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Մերժել"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Ձայնային ներածման ընտրություն"</string>
@@ -3880,7 +3907,7 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Սուր, ի՞նչ կա"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Չիջնե՞նք սուրճի"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Իջնենք։ Լավ տեղ գիտեմ"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Իջնենք․․․ լավ տեղ գիտեմ"</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Թույն"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Երք, 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Երք, 18:01"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Թարմացնե՞լ «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Չցուցադրել շեղող ծանուցումները"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Գործառույթը հասանելի չէ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Հեռախոսի աշխատանքը կդանդաղի"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS-ի չափումների ամբողջական բեռնում"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Թույլատրել աշխատանքը ֆոնային ռեժիմում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9a927ae..66ca07c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap untuk menyiapkan autentikasi wajah"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autentikasi wajah"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Gunakan penyiapan aksesibilitas"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gunakan wajah Anda untuk membuka kunci ponsel, mengizinkan pembelian, atau login ke aplikasi."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gunakan sidik jari untuk membuka ponsel atau menyetujui pembelian.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi Anda."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gunakan wajah Anda untuk membuka kunci ponsel, mengizinkan pembelian, atau login ke aplikasi"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Posisikan wajah Anda di tengah lingkaran"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Lakukan nanti"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Anda dapat menambahkan hingga <xliff:g id="COUNT">%d</xliff:g> wajah"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Sian"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Kuning"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Karena sebuah aplikasi menghalangi permintaan izin, Setelan tidak dapat memverifikasi tanggapan Anda."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika Anda mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g>, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi sandi."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> meminta kontrol penuh atas perangkat ini. Layanan dapat membaca layar dan bertindak atas nama pengguna yang memiliki kebutuhan aksesibilitas. Kontrol tingkat ini tidak sesuai untuk kebanyakan aplikasi."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Menge-tap Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Layanan tidak dipilih"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Perbarui mode Jangan Ganggu"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda notifikasi agar tetap fokus"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Fitur ini tidak tersedia"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Fitur ini akan memperlambat ponsel Anda"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Paksa ukuran GNSS penuh"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Lacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Izinkan aktivitas background dimulai"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index de5bf20..5256e27 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Andliti bætt við"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Ýttu til að setja upp andlitsgreiningu"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Andlitsgreining"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Nota uppsetningu aðgengis"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Notaðu andlitið til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Notaðu andlitið til að taka símann þinn úr lás eða staðfesta kaup.\n\nAthugaðu: Þú getur ekki notað andlitið til að opna þetta tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Notaðu andlitið til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Staðsettu andlit þitt í miðju hringsins"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gera þetta seinna"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> andlitum"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Blágrænn"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Gulur"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Blárauður"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> þarf að:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Stillingar geta ekki staðfest svarið þitt vegna þess að forrit er að fela heimildarbeiðni."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ef þú kveikir á <xliff:g id="SERVICE">%1$s</xliff:g> mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta PIN-númerið þitt."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta aðgangsorðið þitt."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> biður um fulla stjórn yfir þessu tæki. Þjónustan getur lesið af skjánum og gripið til aðgerða fyrir hönd notenda sem hafa ekki aðgang. Þess konar stjórnun er óviðeigandi fyrir flest forrit."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Stöðva <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ef ýtt er á „Í lagi“ stöðvast <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Engin þjónusta uppsett"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Engin þjónusta valin"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Engin lýsing til staðar."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Uppfæra „Ónáðið ekki“"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Gera hlé á tilkynningum svo þær trufli ekki"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Þessi eiginleiki er ekki í boði í þessu tæki"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Þessi eiginleiki er ekki í boði"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Hann hægir á símanum"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Full GNSS-mæling"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rekja öll GNSS söfn og tíðnir með engum vinnulotum"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Leyfa aðgerðir í bakgrunninum"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2f09c9d..3a3d983 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Volto aggiunto"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tocca per impostare autenticazione volti"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticazione volti"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Usa configurazione accessibilità"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa il tuo volto per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilizza il tuo volto per sbloccare il telefono o approvare gli acquisti.\n\nNota: non puoi utilizzare il tuo volto per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore della tua organizzazione."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa il tuo volto per sbloccare il telefono, autorizzare gli acquisti o accedere alle app"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Inquadra il tuo volto nel cerchio"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fallo più tardi"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> volti"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Ciano"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Giallo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Un\'app sta oscurando una richiesta di autorizzazione, pertanto Impostazioni non può verificare la tua risposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se attivi <xliff:g id="SERVICE">%1$s</xliff:g>, il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare il PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> richiede il totale controllo di questo dispositivo. Il servizio può leggere i contenuti sullo schermo e agire per conto di utenti con esigenze di accessibilità. Questo livello di controllo non è appropriato per la maggior parte delle app."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Interrompere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Se tocchi OK, il servizio <xliff:g id="SERVICE">%1$s</xliff:g> verrà interrotto."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nessun servizio installato"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nessun servizio selezionato"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aggiorna modalità Non disturbare"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Metti in pausa le notifiche per mantenere la concentrazione"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Questa funzionalità non è disponibile"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Rallenta il telefono"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forza esecuzione completa delle misurazioni GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Consenti l\'avvio dell\'attività in background"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e283d66..7447d6d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"הפנים נוספו"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"יש להקיש כדי להגדיר אימות פנים"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"אימות פנים"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"שימוש בהגדרת הנגישות"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ניתן להשתמש באימות פנים כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"שימוש בפנים כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בפנים כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ניתן להשתמש באימות פנים כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"צריך למקם את הפנים בתוך העיגול"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"מאוחר יותר"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ניתן להוסיף עד <xliff:g id="COUNT">%d</xliff:g> פנים"</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ציאן"</string>
     <string name="color_yellow" msgid="9112680561610873529">"צהוב"</string>
     <string name="color_magenta" msgid="5059212823607815549">"מגנטה"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"‏<xliff:g id="SERVICE">%1$s</xliff:g> צריך אפשרות לבצע:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"אם תפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את קוד הגישה שלך."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את הסיסמה שלך."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"השירות <xliff:g id="SERVICE">%1$s</xliff:g> מבקש שליטה מלאה במכשיר זה. השירות יכול לקרוא את המסך ולפעול בשמם של משתמשים בעלי צרכים של נגישות. רמה כזו של שליטה אינה מתאימה לרוב האפליקציות."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"הקשה על \'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"לא נבחר שירות"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
@@ -4475,8 +4502,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"עדכון המצב \'נא לא להפריע\'"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"אפשר להשהות את ההתראות כדי שלא יפריעו לך"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"תכונה זו לא זמינה"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"הטלפון יפעל באיטיות עם תכונה זו"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏אילוץ של הרצה מלאה של מדידות Gnss"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‏מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"הפעלת התחלות של פעילות ברקע"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6e5f495..831368e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"顔を追加しました"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"タップして顔認証を設定してください"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"顔認証"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ユーザー補助の設定を使用"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"顔認証を使用して、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"顔を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 顔を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"顔認証を使用して、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"顔が円の中央にくるようにしてください"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"後で"</string>
     <string name="face_add_max" msgid="4408683751143942949">"最大で <xliff:g id="COUNT">%d</xliff:g> 個の顔を追加できます"</string>
@@ -831,7 +838,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC を ON にする"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC がこのデバイスと他の付近のデバイスまたはターゲット（決済デバイス、アクセス リーダー、インタラクティブ広告またはタグなど）の間でデータのやり取りを行います。"</string>
     <string name="nfc_secure_settings_title" msgid="150400737244061585">"NFC の保護"</string>
-    <string name="nfc_secure_toggle_summary" product="default" msgid="2135032222065627938">"画面がロックされている場合のみ NFC 決済と乗換案内の使用を許可します"</string>
+    <string name="nfc_secure_toggle_summary" product="default" msgid="2135032222065627938">"画面がアンロックされている場合のみ NFC 決済と公共交通機関での利用を許可します"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android ビーム"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"アプリコンテンツをNFCで転送できます"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
@@ -900,7 +907,7 @@
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"Wi‑Fi のスキャンを ON にする"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="6352918945128328916">"Wi‑Fi を自動的に ON にするには、まず Wi‑Fi のスキャンを ON にしてください。"</string>
-    <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"Wi-Fi のスキャンでは、アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。たとえば、位置情報を使用する機能やサービスの改善に役立ちます。"</string>
+    <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"Wi-Fi のスキャンでは、アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"ON にする"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="5527653791584018157">"Wi‑Fi のスキャンを ON にしました"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"詳細設定"</string>
@@ -1670,9 +1677,9 @@
     <string name="location_low_battery_use" msgid="8602232529541903596">"電池使用量: 低"</string>
     <string name="location_scanning_screen_title" msgid="2297479353298444503">"Wi‑Fi のスキャンと Bluetooth のスキャン"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fiのスキャン"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。この設定は、たとえば、位置情報を使用する機能やサービスの改善に役立ちます。"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetoothのスキャン"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。この設定は、たとえば、位置情報を使用する機能やサービスの改善に役立ちます。"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="managed_profile_location_services" msgid="4723268446874715222">"仕事用プロファイル向けの位置情報サービス"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"水色"</string>
     <string name="color_yellow" msgid="9112680561610873529">"黄"</string>
     <string name="color_magenta" msgid="5059212823607815549">"マゼンタ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要です。"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"アプリが許可リクエストを隠しているため、設定側でユーザーの応答を確認できません。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにすると、デバイスデータの暗号化の強化に画面ロックは使用されなくなります。"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、PINの確認が必要となります。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パスワードの確認が必要となります。"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> はこのデバイスのフル コントロールをリクエストしています。これは、ユーザー補助を必要とするユーザーに代わって画面を読み上げたり操作したりするサービスです。大半のアプリに、このレベルのコントロールは適していません。"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>を停止しますか？"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"[OK] をタップすると「<xliff:g id="SERVICE">%1$s</xliff:g>」が停止します。"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"インストールされているサービスはありません"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"サービスが選択されていません"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
@@ -2327,7 +2354,7 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"このアプリはバックグラウンドで電池を使用するため、電池が予想より早くなくなる可能性があります。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"削除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"キャンセル"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"アプリの電池使用量は正常です。アプリが電池を使いすぎる場合は、対処可能なおすすめの方法がスマートフォンに表示されます。\n\n電池の残量が少なくなったら、いつでもバッテリー セーバーを ON にできます。"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"アプリの電池使用量は正常です。アプリが電池を使いすぎる場合は、おすすめの対処方法をスマートフォンがお知らせします。\n\n電池の残量が少なくなったら、いつでもバッテリー セーバーを ON にできます。"</string>
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"アプリの電池使用量は正常です。アプリが電池を使いすぎる場合は、対処可能なおすすめの方法がタブレットに表示されます。\n\n電池の残量が少なくなったら、いつでもバッテリー セーバーを ON にできます。"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"アプリの電池使用量は正常です。アプリが電池を使いすぎる場合は、対処可能なおすすめの方法がデバイスに表示されます。\n\n電池の残量が少なくなったら、いつでもバッテリー セーバーを ON にできます。"</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"バッテリー マネージャ"</string>
@@ -2461,7 +2488,7 @@
     <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"スケジュールなし"</string>
     <string name="battery_saver_auto_routine" msgid="8076053160450346731">"ルーティンに基づく"</string>
     <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"残量に基づく"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"次回の通常の充電前に電池が切れる可能性がある場合、バッテリー セーバーが ON になります"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"次回のいつもの充電前に電池が切れる可能性がある場合、バッテリー セーバーが ON になります"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"<xliff:g id="PERCENT">%1$s</xliff:g> で ON"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"スケジュールの設定"</string>
     <string name="battery_saver_turn_on_summary" msgid="5552800757174173459">"電池を長持ちさせる"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"サイレント モードの更新"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"集中するために通知を一時停止する"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"この機能は、お使いのデバイスではご利用いただけません"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"この機能はご利用いただけません"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"このスマートフォンの動作が遅くなります"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS 計測の完全な実行"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"デューティ サイクリングを無効にした状態で、すべての GNSS コンステレーションと頻度をトラッキングします"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"バックグラウンド アクティビティの開始を許可"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 24ec2f4..c3a9efb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -355,7 +355,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"დაუყოვნებლივ ძილის შემდეგ, როდესაც არ არის განბლოკილი <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>-ის მიერ"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ძილის შემდეგ, გარდა <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>-ის მიერ განბლოკილ მდგომარეობაში დატოვებისას"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"მფლობელის ინფორმაციის დაბლოკვის ეკრანზე ჩვენება"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"ეკრანის ბლოკის შეტყობ."</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"შეტყობინება ჩაკეტილ ეკრანზე"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ვიჯეტების ჩართვა"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="lockdown_settings_title" msgid="7393790212603280213">"დაბლოკვის ვარიანტის ჩვენება"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"სახე დამატებულია"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"შეეხეთ სახის ამოცნობის დასაყენებლად"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"სახის ამოცნობა"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ადაპტირებული დაყენება"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის თუ აპებში შესასვლელად."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: ამ მოწყობილობას სახით ვერ განბლოკავთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის თუ აპებში შესასვლელად"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"მოაქციეთ თქვენი სახე წრეში"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"მოგვიანებით გაკეთება"</string>
     <string name="face_add_max" msgid="4408683751143942949">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> სახე"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ცისფერი"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ყვითელი"</string>
     <string name="color_magenta" msgid="5059212823607815549">"მეწამული"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს ესაჭიროება:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"აპის მიერ ნებართვის მოთხოვნის დაფარვის გამო, ვერ ხერხდება თქვენი პასუხის დადასტურება პარამეტრებით."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს თუ ჩართავთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ პაროლი."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ითხოვს სრულ კონტროლს ამ მოწყობილობაზე. სერვისს შეუძლია ეკრანზე არსებული კონტენტის წაკითხვა და განსაკუთრებული საჭიროების მქონე მომხმარებლების სახელით მოქმედება. ამ დონის კონტროლი არ არის საჭირო აპების უმეტესობისთვის."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"გაითიშოს <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"„კარგი“-ზე შეხება შეაჩერებს <xliff:g id="SERVICE">%1$s</xliff:g>-ს."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"სერვისები დაყენებული არ არის"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"სერვისი არჩეულია არ არის"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"აღწერა არ არის მოწოდებული."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"„არ შემაწუხოთ“ რეჟიმის განახლება"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"შეტყობინებების დაპაუზება კონცენტრირების შესანარჩუნებლად"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ამ მოწყობილობაზე ეს ფუნქცია მიუწვდომელია"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ეს ფუნქცია მიუწვდომელია"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ის შეანელებს ამ ტელეფონს"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"სრული GNSS გაზომვის განხორციელების იძულება"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ყველა GNSS კონსტელაციისა და სიხშირის აღრიცხვა, დატვირთვის კოეფიციენტის გარეშე"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"აქტივობის ფონურ რეჟიმში დაწყების დაშვება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 092bb79..6ede2cb 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Бет енгізілді"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Түртіп, бетті тану функциясын реттеңіз"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Бетті тану"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Арнайы мүмкіндіктерді пайдалану"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Телефоныңыздың құлпын ашу, сатып алу транзакцияларына рұқсат беру немесе қолданбаларға кіру үшін бетті тану функциясын қолданыңыз."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Бетіңіз арқылы телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын бетіңіз арқылы аша алмайсыз. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Телефоныңыздың құлпын ашу, сатып алу транзакцияларына рұқсат беру немесе қолданбаларға кіру үшін бетті тану функциясын қолданыңыз"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Бетіңізді шеңбердің ортасына дәлдеңіз"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Кейінірек"</string>
     <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> бетке дейін енгізуге болады"</string>
@@ -430,7 +437,7 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="3555852478589689141">"Растау түймесі"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="7965662696468917986">"Қолданбаларды пайдалануға рұқсат бергенде, міндетті түрде растау керек"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"Бет деректерін жою"</string>
-    <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"Жаңа Face Unlock функциясын реттеу"</string>
+    <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"Face Unlock арқылы жаңа бет енгізу"</string>
     <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады (көзіңізді ашып тұруыңыз керек).\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, бауырыңыз немесе балаңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Бет туралы деректер жойылсын ба?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="2609671025686003946">"Face Unlock жазған деректер біржола және қауіпсіз түрде жойылады. Жойылғаннан кейін, телефоныңыздың құлпын ашу, қолданбаларға кіру және төлемдерді растау үшін PIN коды, өрнек немесе құпия сөз қажет болады."</string>
@@ -481,12 +488,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Кейінірек"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7914950545902198894">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтындай етіп, экранын құлыптаңыз. Саусақ ізін тануды реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="2300047476104528001">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Саусақ ізін тануды реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="5823994499768751994">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтындай етіп, экранын құлыптаңыз. Саусақ ізін тануды реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="4490601819500843860">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтындай етіп, экранын құлыптаңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="3741624920522374098">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="3523360900206227082">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтындай етіп, экранын құлыптаңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7914950545902198894">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Саусақ ізін тануды реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="2300047476104528001">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Саусақ ізін тануды реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="5823994499768751994">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Саусақ ізін тануды реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="4490601819500843860">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="3741624920522374098">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="3523360900206227082">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Бетті тану функциясын реттеу үшін де экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын, өрнекті немесе құпия сөзді орнатыңыз."</string>
     <string name="lock_screen_pin_skip_title" msgid="8064328201816780457">"PIN коды реттелмесін бе?"</string>
     <string name="lock_screen_password_skip_title" msgid="4155009417576409182">"Құпия сөз реттелмесін бе?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="6467327818577283960">"Өрнек реттелмесін бе?"</string>
@@ -779,7 +786,7 @@
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Телефон <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Планшет <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Құрылғы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
-    <string name="bluetooth_untethered_unpair_dialog_body" msgid="5932168717642676140">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы енді осы есептік жазбаға байланыстырылған ешбір құрылғымен жұпталмайды."</string>
+    <string name="bluetooth_untethered_unpair_dialog_body" msgid="5932168717642676140">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы енді осы есептік жазбаға байланыстырылған ешбір құрылғымен жұптаспайды."</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Құрылғыны ұмыту"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"…қосылу"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> медиа аудиосынан ажыратылады."</string>
@@ -2102,10 +2109,10 @@
     <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"Күту уақыты"</string>
     <string name="accessibility_autoclick_description" msgid="4908960598910896933">"Тінтуір пайдаланып жатсаңыз, курсор белгілі уақыт бойы жылжымаған кезде оның автоматты түрде әрекет етуін реттеуіңізге болады."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Басу алдындағы кешігу"</string>
-    <string name="accessibility_vibration_settings_title" msgid="3196059463767462026">"Діріл және сенсор күші"</string>
+    <string name="accessibility_vibration_settings_title" msgid="3196059463767462026">"Діріл және оның күші"</string>
     <string name="accessibility_notification_vibration_title" msgid="3009997451790678444">"Хабарландыру дірілі"</string>
     <string name="accessibility_ring_vibration_title" msgid="5369395955680650778">"Қоңырау дірілі"</string>
-    <string name="accessibility_touch_vibration_title" msgid="3548641513105226156">"Сенсорлық реакция"</string>
+    <string name="accessibility_touch_vibration_title" msgid="3548641513105226156">"Түрту кезіндегі діріл"</string>
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Қызметті пайдалану"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Түсті түзету функциясын пайдалану"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Субтитр пайдалану"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Көгілдір"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Сары"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Қызылкүрең"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> қолданылсын ба?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне қажет:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Бағдарлама рұқсат сұрауын жасырып тұрғандықтан, Параметрлер жауабыңызды тексере алмайды."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> қоссаңыз, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, PIN кодын растау керек."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, құпия сөзді растау керек."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметі құрылғыға толық кіру мүмкіндігін сұрауда. Ол экрандағы мәліметтерді оқып, арнайы мүмкіндіктерді талап ететін пайдаланушылар атынан әрекет ете алады. Мұндай басқару деңгейі қолданбалардың көбісіне сәйкес келмейді."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> тоқтатылсын ба?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Жарайды түймесін түрту <xliff:g id="SERVICE">%1$s</xliff:g> қызметін тоқтатады."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ешқандай қызметтер орнатылмаған"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ешқандай қызмет таңдалмаған"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Сипаттама ұсынылмаған"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Мазаламау\" режимін жаңарту"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Алаңдататын хабарландыруларды кідірту"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Бұл функция істемейді."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Телефонның жұмысы баяулайды."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS толық өлшемдерін қосу"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Жұмыс циклінсіз барлық GNSS тізбектері мен жиіліктерін қадағалау"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Фондық әрекеттердің басталуына рұқсат ету"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 35a2e3b..fee50ea 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -317,7 +317,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"តភ្ជាប់​សេវាកម្ម​ទិន្នន័យ​ ពេលរ៉ូមីង"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"អ្នក​បាត់បង់​ការ​តភ្ជាប់​ទិន្នន័យ ព្រោះ​អ្នក​បាន​ចាកចេញ​​ពី​បណ្ដាញ​នៅ​ផ្ទះ​របស់​អ្នក​ដែល​បាន​បិទ​ការ​រ៉ូមីង​ទិន្នន័យ។"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"បើក​វា"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"អាចនាំឲ្យមានការគិតប្រាក់ច្រើនពីអ្នក"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"អាច​នឹងមាន​ការគិតថ្លៃខ្ពស់​ពីអ្នក។"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ពេល​អ្នក​ឲ្យ​រ៉ូមីង​ទិន្នន័យ អ្នក​អាច​កាត់​លុយ​ពេល​រ៉ូមីង!\n\nការ​កំណត់​នេះ​មាន​ប្រសិទ្ធភាព​សម្រាប់​អ្នក​ប្រើ​ទាំងអស់​លើ​កុំព្យូទ័រ​បន្ទះ​នេះ។"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ពេល​អ្នក​អនុញ្ញាត​​រ៉ូមីង​ទិន្នន័យ អ្នក​អាច​ត្រូវ​បាន​គិត​ថ្លៃ​សេវាកម្ម​រ៉ូមីង​!\n\nការ​កំណត់​នេះ​ប៉ះពាល់​ដល់​អ្នក​ប្រើ​ទាំងអស់​​លើ​ទូរស័ព្ទ​នេះ។"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"ឲ្យ​រ៉ូមីង​ទិន្នន័យ?"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"បាន​បញ្ចូល​មុខ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ចុច​ដើម្បី​រៀបចំ​ការ​ផ្ទៀងផ្ទាត់​មុខ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ការ​ផ្ទៀងផ្ទាត់​មុខ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ប្រើការរៀបចំភាពងាយស្រួល"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ប្រើ​មុខ​របស់អ្នក ដើម្បី​ដោះសោ​ទូរសព្ទ អនុញ្ញាត​ការទិញ ឬ​ចូលកម្មវិធី។"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ប្រើ​មុខ​របស់អ្នក​ដើម្បី​ដោះសោ​ទូរសព្ទ​របស់អ្នក ឬ​យល់ព្រម​លើ​ការទិញ។\n\nចំណាំ៖ អ្នក​មិនអាច​ប្រើមុខ​របស់អ្នក ដើម្បី​ដោះសោ​ឧបករណ៍​នេះ​បាន​ឡើយ។ សម្រាប់​ព័ត៌មាន​បន្ថែម សូមទាក់ទង​អ្នកគ្រប់គ្រង​របស់​ស្ថាប័ន​អ្នក។"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ប្រើមុខ​របស់អ្នក ដើម្បី​ដោះសោ​ទូរសព្ទ អនុញ្ញាត​ការទិញ ឬ​ចូលកម្មវិធី"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ដាក់មុខ​របស់អ្នក​ឱ្យ​ចំកណ្ដាល​រង្វង់"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ចុះឈ្មោះ​នៅ​ពេលក្រោយ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"អ្នកអាច​បញ្ចូល​ផ្ទៃមុខ​បាន​រហូតដល់ <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -497,7 +504,7 @@
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ការបញ្ចូលស្នាមម្រាមដៃមិនបានចប់សព្វគ្រប់ទេ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"រយៈពេលបញ្ចូលស្នាមម្រាមដៃបានអស់ពេលហើយ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ការបញ្ចូលស្នាមម្រាមដៃមិនដំណើរការទេ សូមព្យាយាមម្តងទៀត ឬប្រើម្រាមដៃផ្សេងពីនេះ។"</string>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បន្ថែមផ្សេងទៀត"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បញ្ចូលមួយទៀត"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"បន្ទាប់"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"បន្ថែមលើការដោះសោទូរស័ព្ទរបស់អ្នក អ្នកក៏អាចប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីផ្តល់សិទ្ធិលើការចូលប្រើការទិញ និងកម្មវិធី។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ជម្រើសចាក់​សោ​អេក្រង់​ត្រូវបាន​បិទ។ ដើម្បីស្វែងយល់បន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រងរបស់​សា្ថប័នអ្នក។ "<annotation id="admin_details">"ព័ត៌មានលម្អិតបន្ថែម"</annotation>\n\n"អ្នកនៅតែអាចប្រើស្នាមម្រាមដៃ ដើម្បីផ្តល់សិទ្ធិលើការទិញ និងការចូលប្រើប្រាស់កម្មវីធីបានដដែល។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
@@ -930,8 +937,8 @@
     <string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"ជ្រើសរើសរលកសញ្ញា AP"</string>
     <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ស្វ័យប្រវត្តិ"</string>
-    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"រលកសញ្ញា 2.4 GHz"</string>
-    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"រលកសញ្ញា 5.0 GHz"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"កម្រិតបញ្ជូន 2.4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"កម្រិតបញ្ជូន 5.0 GHz"</string>
     <string name="wifi_ap_prefer_5G" msgid="2501070491623803139">"ប្រើ​រលកសញ្ញា 5.0 GHz ជា​អាទិភាព"</string>
     <string name="wifi_ap_2G" msgid="8378132945192979364">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
@@ -1080,7 +1087,7 @@
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ពាក្យសម្ងាត់​ហតស្ប៉ត"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"រលកសញ្ញា AP"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"កម្រិតបញ្ជូន AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់អ៊ីនធឺណិតដោយប្រើការភ្ជាប់​ទិន្នន័យ​ចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែមទៀត។"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"បិទ​ហតស្ប៉ត​ដោយ​ស្វ័យប្រវត្តិ"</string>
@@ -1252,7 +1259,7 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"កំណត់អេក្រង់របស់អ្នកជាលក្ខណៈផ្ទាល់ខ្លួន"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ជ្រើសរើស​ផ្ទាំង​រូបភាព​ពី"</string>
     <string name="style_suggestion_title" msgid="4710867417147087928">"កំណត់​ Pixel របស់​អ្នកតាមបំណង"</string>
-    <string name="style_suggestion_summary" msgid="4592087484229499188">"សាកប្រើរចនាប័ទ្ម ផ្ទាំងរូបភាព នាឡិកា និងអ្វីៗជាច្រើនផ្សេងទៀត"</string>
+    <string name="style_suggestion_summary" msgid="4592087484229499188">"សាកប្រើរចនាប័ទ្ម ផ្ទាំងរូបភាព នាឡិកា និងអ្វីៗជាច្រើនទៀត"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"ធាតុរក្សាអេក្រង់"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"ខណៈពេលកំពុងសាក ឬបានភ្ជាប់"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"ទាំង​ពីរ"</string>
@@ -1815,7 +1822,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"ភាព​ត្រូវ​គ្នា​នៃ​អេក្រង់"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ការអនុញ្ញាត"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ឃ្លាំង​សម្ងាត់"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"សម្អាត​ឃ្លាំង"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"សម្អាត​ឃ្លាំងផ្ទុកទិន្នន័យ"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"ឃ្លាំងផ្ទុកទិន្នន័យ"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="other">ធាតុ %d</item>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ពណ៌ផ្ទៃមេឃ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ពណ៌លឿង"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ពណ៌ក្រហម​ស្វាយ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ត្រូវ​ការ៖"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ដោយសារកម្មវិធីមួយកំពុងធ្វើឲ្យសំណើរអនុញ្ញាតមានភាពមិនច្បាស់ ការកំណត់នេះមិនអាចផ្ទៀងផ្ទាត់ការឆ្លើយតបរបស់អ្នកបានទេ។"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"បើ​អ្នក​បើក <xliff:g id="SERVICE">%1$s</xliff:g>, ឧបករណ៍របស់​អ្នកនឹង​មិន​ប្រើ​អេក្រង់​ជាប់សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ​ទេ។"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"ព្រោះ​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​កូដ PIN ​របស់​អ្នក។"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"ព្រោះ​​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​ពាក្យសម្ងាត់​របស់​អ្នក។"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> កំពុង​ស្នើ​សុំគ្រប់គ្រង​ឧបករណ៍​នេះ​ទាំងស្រុង។ សេវាកម្ម​នេះអាច​អាន​អេក្រង់ និងធ្វើសកម្មភាពជំនួស​ឱ្យអ្នកប្រើប្រាស់​ដែលត្រូវការ​មុខងារ​ភាពងាយស្រួល។ កម្រិត​នៃការគ្រប់គ្រង​នេះ​មិនស័ក្តិសម​សម្រាប់​កម្មវិធី​ភាគច្រើនទេ។"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"បញ្ឈប់ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ការប៉ះ យល់ព្រម នឹងបញ្ឈប់ <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"មិនបានជ្រើសរើសសេវាកម្មណាមួយឡើយ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"គ្មាន​ការ​ពណ៌នា​បាន​ផ្ដល់។"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"ធ្វើ​បច្ចុប្បន្នភាព​មុខងារ​កុំរំខាន"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ផ្អាក​ការជូនដំណឹង​ដើម្បីផ្តោត​អារម្មណ៍"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះ​មិនមាន​នៅលើ​ឧបករណ៍​នេះទេ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"មិនអាចប្រើ​មុខងារ​នេះ​បានទេ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"មុខងារនេះ​នឹង​ធ្វើឱ្យ​ទូរសព្ទ​នេះ​ដំណើរការយឺត"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់​ដែល​គ្មាន​ការបែង​ចែក​រយៈពេល​ដំណើរការ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"អនុញ្ញាតឱ្យ​សកម្មភាពនៅ​ផ្ទៃខាងក្រោយ​ចាប់ផ្តើម"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b0cfd32..41780aa 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ಮುಖ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ಮುಖ ಗುರುತಿಸುವಿಕೆ ಸೆಟಪ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ಮುಖ ಗುರುತಿಸುವಿಕೆ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟಪ್‌ ಬಳಸಿ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ವೃತ್ತದ ಮಧ್ಯದಲ್ಲಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಇರಿಸಿ"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ನಂತರ ಮಾಡಿ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ನೀವು <xliff:g id="COUNT">%d</xliff:g> ಮುಖಗಳವರೆಗೂ ಸೇರಿಸಬಹುದು"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ಹಸಿರುನೀಲಿ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ಹಳದಿ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ಕೆನ್ನೇರಿಳೆ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ಈ ಕೆಳಗಿನವುಗಳನ್ನು ಮಾಡುತ್ತದೆ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ಅನುಮತಿ ವಿನಂತಿಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಚುತ್ತಿರುವ ಕಾರಣ, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ಅನ್ನು ನೀವು ಆನ್‌ ಮಾಡಿದರೆ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ PIN ಅನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"ಈ ಸಾಧನದ ಪೂರ್ಣ ನಿಯಂತ್ರಣವನ್ನು <xliff:g id="SERVICE">%1$s</xliff:g>ವಿನಂತಿಸುತ್ತಿದೆ. ಸೇವೆಯು ಸ್ಕ್ರೀನ್ ಅನ್ನು ಓದಬಹುದು ಮತ್ತು ಪ್ರವೇಶ ಅಗತ್ಯಗಳೊಂದಿಗೆ ಬಳಕೆದಾರರ ಪರವಾಗಿ ಕಾರ್ಯನಿರವಹಿಸುತ್ತದೆ. ಹೆಚ್ಚಿನ ಆ್ಯಪ್‌ಗಳಿಗೆ ಈ ಮಟ್ಟದ ನಿಯಂತ್ರಣ ಸೂಕ್ತವಲ್ಲ."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ಸರಿ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ <xliff:g id="SERVICE">%1$s</xliff:g> ನಿಲ್ಲುತ್ತದೆ."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ಯಾವುದೇ ಸೇವೆಗಳನ್ನು ಸ್ಥಾಪಿಸಿಲ್ಲ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ಯಾವುದೇ ಸೇವೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ಯಾವುದೇ ವಿವರಣೆಯನ್ನು ಒದಗಿಸಿಲ್ಲ."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ಫೋಕಸ್‌ ಆಗಿ ಇರಲು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ಈ ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ಇದರಿಂದ, ಫೋನ್‌ನ ಕಾರ್ಯಾಚರಣೆ ನಿಧಾನವಾಗುತ್ತದೆ"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ಫೋರ್ಸ್‌ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್‌ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಪ್ರಾರಂಭಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fa7c5f1..dc1980e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"얼굴 추가 완료"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"얼굴 인증을 설정하려면 탭하세요."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"얼굴 인증"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"접근성 설정 사용"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인하세요."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 얼굴로 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인하세요."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"얼굴을 동그라미 중앙에 맞춰주세요"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"나중에"</string>
     <string name="face_add_max" msgid="4408683751143942949">"얼굴을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"청록색"</string>
     <string name="color_yellow" msgid="9112680561610873529">"노란색"</string>
     <string name="color_magenta" msgid="5059212823607815549">"자홍색"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"권한 요청을 보이지 않게 하는 앱이 있어서 설정에서 내 응답을 확인할 수 없습니다."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 PIN 확인이 필요합니다."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 비밀번호 확인이 필요합니다."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>이(가) 기기의 전체 제어 권한을 요청합니다. 서비스가 화면을 읽고 거동이 불편한 사용자를 대신하여 작업을 실행할 수 있습니다. 대부분의 앱에는 이러한 제어 수준이 적절하지 않습니다."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지하시겠습니까?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"확인을 탭하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"선택된 서비스 없음"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"방해 금지 모드 업데이트"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"방해받지 않도록 알림 일시중지"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"이 기기에서 지원하지 않는 기능입니다."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"이 기능은 사용할 수 없습니다."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"휴대전화 속도를 저하시키는 기능입니다."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"전체 GNSS 측정 강제 사용"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"듀티 사이클 없이 모든 GNSS 배열 및 빈도를 추적"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"백그라운드 활동 시작 허용"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index db4f528..6bd2ef7 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -398,6 +398,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Жүз кошулду"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Жүздүн аныктыгын текшерүүнү жөндөө үчүн басыңыз"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Жүздүн аныктыгын текшерүү"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Атайын мүмкүнчүлүктөрдү колдонуу"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -408,7 +413,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн жүзүңүздү көрсөтүңүз."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн жүзүңүздү пайдаланыңыз.\n\nЭскертүү: Жүзүңүздү бул түзмөктүн кулпусун ачууга колдоно албайсыз. Кеңири маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн жүзүңүздү көрсөтүңүз."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Жүзүңүздү тегеректин борборуна жайгаштырыңыз"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Азыр эмес"</string>
     <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> чейин жүз кошсоңуз болот"</string>
@@ -2186,7 +2193,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Кызгылт көк"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Сары"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Кочкул"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдоносузбу?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
@@ -2195,8 +2203,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, PIN ырасташыңыз керек."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, сырсөзүңүздү ырасташыңыз керек."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> бул түзмөктү толук көзөмөлдөөнү талап кылууда. Бул кызмат экранды окуп, атайын мүмкүнчүлүктөрдү пайдаланган колдонуучулардын атынан аракеттерди жасай алат. Көзөмөлдүн деңгээли колдонмолордун көбүнө ылайыксыз."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> токтотулсунбу?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"OK тапталганда <xliff:g id="SERVICE">%1$s</xliff:g> токтотулат."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Эч кандай кызматтар орнотулган эмес"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Бир да кызмат тандалган жок"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Эч кандай сүрөттөө берилген эмес."</string>
@@ -2885,7 +2912,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Колдонуучу"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Чектелген профайл"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Жаңы колдонуучу кошосузбу?"</string>
-    <string name="user_add_user_message_long" msgid="6768718238082929201">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өз мейкиндиги болуп, алар аны өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен ыңгайлаштырып алышат. Колдонуучулар Wi‑Fi сыяктуу, баарына таасирин тийгизүүчү, түзмөк жөндөөлөрүн да тууралай алышат.\n\nЖаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу калган бардык колдонуучулар үчүн да жаңырта алат. Атайын мүмкүнчүлүктөрдүн жөндөөлөрү жана кызматтар жаңы колдонуучуга которулбай калышы мүмкүн."</string>
+    <string name="user_add_user_message_long" msgid="6768718238082929201">"Эгер түзмөгүңүздү дагы бир адам колдонуп жаткан болсо, кошумча профилдерди түзүп коюңуз. Профилдин ээси аны өзү каалагандай жөндөп, тушкагаздарды коюп, керектүү колдонмолорду орнотуп алат. Мындан тышкары, колдонуучулар түзмөктүн Wi‑Fi´ды өчүрүү/күйгүзүү сыяктуу жалпы жөндөөлөрүн өзгөртө алат.\n\nПрофиль түзүлгөндөн кийин, аны жөндөп алуу керек.\n\nЖалпы колдонмолорду баары жаңырта алат, бирок атайын мүмкүнчүлүктөр өз-өзүнчө жөндөлөт."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Жаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Профилди жөндөйсүзбү?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Өз мейкиндигин жөндөп алышы үчүн түзмөктү колдонуучуга беришиңиз керек."</string>
@@ -3207,7 +3234,7 @@
     <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\"Тынчымды алба\" режиминин эрежелерин коюу"</string>
     <string name="zen_mode_schedule_title" msgid="8616187805239590649">"Ырааттама"</string>
     <string name="zen_mode_use_automatic_rule" msgid="489102635414919052">"Ырааттаманы колдонуу"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Шашылыш эскертмелер гана"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Шашылыш билдирүүлөр гана"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкуч гана"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Тымтырс"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3220,7 +3247,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Билдирмелер келгенде телефонуңуздун үнү чыкпайт же дирилдебейт."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Телефонуңуз жаңы же учурдагы билдирмелерди көрсөтпөйт жана үн чыгарып же дирилдебейт. Бирок телефондун негизги аракеттери жана абалы үчүн зарыл болгон маанилүү билдирмелер көрсөтүлө берээрин эске алыңыз.\n\n\"Тынчымды алба\" режими өчүрүлгөндө, экранды ылдый сүрүп, бардык билдирмелерди көрүңүз."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Жаңы же учурдагы билдирмелер көрүнбөйт, телефондун үнү чыкпайт же дирилдебейт. Бирок телефондун негизги функцияларынын иштеши үчүн зарыл болгон маанилүү билдирмелерди ала бересиңер.\n\n\"Тынчымды алба\" режими өчүрүлгөндөн кийин, жашырылган билдирмелерди көрүү үчүн экранды ылдый сүрүп коюңуз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Ыңгайлаштырылган"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ыңгайлаштырылган жөндөөнү иштетүү"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ыңгайлаштырылган жөндөөнү алып салуу"</string>
@@ -3233,8 +3260,8 @@
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"Үнүн жана дирилдөөнү басуу"</string>
     <string name="zen_mode_block_effect_intent" msgid="350764335391428447">"Экран күйгүзүлбөсүн"</string>
     <string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Жарык индикатору күйгүзүлбөсүн"</string>
-    <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Билдирмелер башка колдонмолордун үстүнөн көрүнбөсүн"</string>
-    <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Экрандын өйдө жагындагы абал тилкесиндеги сүрөтчөлөрдү жашыруу"</string>
+    <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Билдрмлер башка колднмолрдн үстнөн көрүнбсүн"</string>
+    <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Экрандн өйдө жагындгы абал тилксндги сүртчлрдү жашруу"</string>
     <string name="zen_mode_block_effect_badge" msgid="214553506070597320">"Билдирме белгилерин/сүрөтчөлөрдү жашыруу"</string>
     <string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"Билдирмелер тынчымды албасын"</string>
     <string name="zen_mode_block_effect_list" msgid="4722887783222298295">"Тигинен жайгашкан экранда жашыруу"</string>
@@ -3257,7 +3284,7 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"\"Тынчымды алба\" режимин автоматтык түрдө <xliff:g id="APP_NAME">%s</xliff:g> колдонмосу күйгүздү"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="1965922539531521052">"\"Тынчымды алба\" режими <xliff:g id="RULE_NAMES">%s</xliff:g> үчүн жөндөлдү."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="7555742240858292255"><annotation id="link">" Ыңгайлаштырылган жөндөөлөрдү көрүү"</annotation></string>
-    <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Шашылыш эскертмелер гана"</string>
+    <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Шашылыш билдирүүлөр гана"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3291,7 +3318,7 @@
     <string name="zen_custom_settings_notifications_header" msgid="6931035609369698584">"Билдирмелер"</string>
     <string name="zen_custom_settings_duration_header" msgid="1190989278065507035">"Узактыгы"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Билдирүүлөр, иш-чаралар жана эстеткичтер"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"\"Тынчымды алба\" режиминде билдирүүлөр, эстеткичтер жана иш-чаралар тууралуу билдирмелер үнсүз режимде алынат (жогоруда уруксат берилгендерден тышкары). Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүнүн үнүн угуп алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"Бүттү"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Жөндөөлөр"</string>
     <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
@@ -3326,11 +3353,11 @@
     <string name="hide_silent_icons_title" msgid="3803036978493857276">"Маанилүү эмес билдирмелердин сүрөтчөлөрүн жашыруу"</string>
     <string name="hide_silent_icons_summary" msgid="8422819235336628802">"Маанилүү эмес билдирмелердин сүрөтчөлөрү абал тилкесинде көрсөтүлбөйт"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Билдирмелердин белгилери көрүнсүн"</string>
-    <string name="notification_bubbles_title" msgid="526545466417027926">"Көбүктөр"</string>
+    <string name="notification_bubbles_title" msgid="526545466417027926">"Калкып чыкма билдирмелер"</string>
     <string name="notification_bubbles_summary" msgid="5269674863510678257">"Калкыма кыска жолдор аркылуу колдонмодогу мазмунга каалаган жерден тез өтүңүз"</string>
     <string name="bubbles_feature_education" msgid="69923617148394578">"Айрым билдирмелер экранга калкып чыкма кеңештер түрүндө көрүнөт. Аны ачуу үчүн басып коюңуз. Ал эми жашыруу үчүн, экрандын төмөн жагына сүйрөп барыңыз."</string>
-    <string name="bubbles_app_toggle_title" msgid="9143702245165359360">"Көбүктөр"</string>
-    <string name="bubbles_app_toggle_summary" msgid="7714358008428342285">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна айрым билдирмелерди көбүк катары көрсөтүүгө уруксат берүү"</string>
+    <string name="bubbles_app_toggle_title" msgid="9143702245165359360">"Калкып чыкма билдирмелер"</string>
+    <string name="bubbles_app_toggle_summary" msgid="7714358008428342285">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна айрым билдирмелерди калкып чыкма кеңеш катары көрсөтүүгө уруксат берүү"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="8013961655723563787">"Көбүктөрдү күйгүзүү"</string>
     <string name="bubbles_feature_disabled_dialog_text" msgid="3616822820657195387">"Бул колдонмо үчүн көбүктөрдү күйгүзүү үчүн, алгач көбүктөрдү түзмөгүңүз үчүн күйгүзүшүңүз керек. Бул аракет көбүктөр мурун күйгүзүлгөн башка колдонмолорго таасирин тийгизет."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="5317196831268846883">"Түзмөк үчүн күйгүзүңүз"</string>
@@ -3517,8 +3544,8 @@
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> баштап <xliff:g id="END">%2$s</xliff:g> чейин"</string>
     <string name="zen_mode_calls" msgid="4769117032399813012">"Чалууларга уруксат берүү"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"Чалуулар"</string>
-    <string name="zen_mode_calls_footer" msgid="2002070641802102110">"Уруксат берилген номерлердин шыңгырашы үчүн түзмөгүңүздүн жөндөөсү шыңгыроо, дирилдөө же үнсүз деп коюлганын текшериңиз."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үчүн кириш чалуулар бөгөттөлгөн. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
+    <string name="zen_mode_calls_footer" msgid="2002070641802102110">"Маанилүү чалууларды өткөрүп жибербөө үчүн түзмөктүн үнүн чыгарып коюуңуз же дирилдөөнү иштетиңиз."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"Кирүүчү чалуулар \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси менен бөгөттөлгөн. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын чалууларын кабыл алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Жылдызчаланган байланыштар"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="other">Башка <xliff:g id="NUM_PEOPLE">%d</xliff:g> байланыш</item>
@@ -3526,7 +3553,7 @@
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"Билдирүүлөргө уруксат берүү"</string>
     <string name="zen_mode_messages_footer" msgid="2616568463646674149">"Уруксат берилген билдирүүлөрдүн шыңгырашы үчүн түзмөгүңүздүн жөндөөсү шыңгыроо, дирилдөө же үнсүз деп коюлганын текшериңиз."</string>
-    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үчүн кириш чалуулар бөгөттөлгөн. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
+    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси иштетилгенде, билдирүүлөр алынбайт. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүн алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS жана жазышуу үндөрү"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Баарынан"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Байланыштардан гана"</string>
@@ -4312,8 +4339,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Тынчымды алба\" режимин жаңыртуу"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Алагды кылбоо үчүн билдирмелерди тындыруу"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Бул функция жеткиликтүү эмес"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ал функция телефондун иштешин жайлатат"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Фондогу аракеттерге уруксат берүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 8da9685..ae371d3 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -196,11 +196,11 @@
     <string name="intent_sender_account_label" msgid="465210404475603404">"ບັນຊີ:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"ພຣັອກຊີ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"ລຶບ"</string>
-    <string name="proxy_port_label" msgid="5655276502233453400">"ພອດ Proxy"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"ພອດພ​ຣັອກ​ຊີ"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ບໍ່ໃຊ້ Proxy ສຳລັບ"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"ໃຊ້ການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"ແລ້ວໆ"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy hostname"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"ຊື່​ໂຮ​ສພ​ຣັອກ​ຊີ"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ກະລຸນາຮັບຊາບ"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ຕົກລົງ"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"hostname ທີ່ທ່ານລະບຸນັ້ນບໍ່ຖືກຕ້ອງ."</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ເພີ່ມໜ້າແລ້ວ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ແຕະເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນດ້ວຍໃບໜ້າ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ການພິສູດຢືນຢັນດ້ວຍໃບໜ້າ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ໃຊ້ການຕັ້ງຄ່າການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ໃຫ້ໜ້າຂອງທ່ານຢູ່ໃນວົງມົນ"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ເຮັດໃນພາຍຫຼັງ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ທ່ານສາມາດເພີ່ມບໍ່ເກີນ <xliff:g id="COUNT">%d</xliff:g> ໃບໜ້າ"</string>
@@ -1871,7 +1878,7 @@
     <string name="internal_storage" msgid="1584700623164275282">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"ກຳລັງຄຳນວນຂະໜາດຄືນໃໝ່..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"ລຶບຂໍ້ມູນແອັບບໍ່?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ຂໍ້ມູນທັງໝົດຂອງແອັບຯນີ້ຈະຖືກລຶບອອກຖາວອນ ເຊິ່ງຮວມເຖິງໄຟລ໌, ການຕັ້ງຄ່າ, ບັນຊີ, ຖານຂໍ້ມູນ ແລະອື່ນໆທັງໝົດນຳ."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ຂໍ້ມູນທັງໝົດຂອງແອັບນີ້ຈະຖືກລຶບອອກຖາວອນ ເຊິ່ງຮວມເຖິງໄຟລ໌, ການຕັ້ງຄ່າ, ບັນຊີ, ຖານຂໍ້ມູນ ແລະ ອື່ນໆທັງໝົດນຳ."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ຕົກລົງ"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ຍົກເລີກ"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ຟ້າຂຽວ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ເຫຼືອງ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ແດງມ່ວງ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ຕ້ອງການ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ເພາະ​ວ່າ​ແອັບຯ​ກຳ​ລັງ​ຂັດ​ຂວາງ​ການ​ຂໍ​ອະ​ນຸ​ຍາດ, ການ​ຕັ້ງ​ຄ່າ​ບໍ່​ສາ​ມາດກວດ​ສອບ​ການ​ຕອບ​ຮັບ​ຂອງ​ທ່ານ​ໄດ້."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ຫາກ​ທ່ານ​ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>, ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​​ລະ​ຫັດ PIN ​ຂອງ​ທ່ານ."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ​ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ກຳລັງຮ້ອງຂໍການຄວບຄຸມອຸປະກອນນີ້ຢ່າງເຕັມຮູບແບບ. ບໍລິການຈະສາມາດອ່ານໜ້າຈໍ ແລະ ດຳເນີນການໃນນາມຜູ້ໃຊ້ທີ່ມີຄວາມຕ້ອງການຊ່ວຍເຂົ້າເຖິງໄດ້. ການຄວບຄຸມລະດັບນີ້ບໍ່ເໝາະສົມສຳລັບແອັບສ່ວນໃຫຍ່."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"ຢຸດການເຮັດວຽກຂອງ <xliff:g id="SERVICE">%1$s</xliff:g> ບໍ່?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ການແຕະປຸ່ມ ຕົກລົງ ຈະຢຸດ <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ບໍ່ໄດ້ເລືອກບໍລິການເທືື່ອ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ບໍ່ມີລາຍລະອຽດລະບຸໄວ້."</string>
@@ -2332,7 +2359,7 @@
     <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"ແອັບຂອງທ່ານກຳລັງໃຊ້ແບັດເຕີຣີໃນປະລິມານປົກກະຕິ. ຫາກແອັບຕ່າງໆໃຊ້ແບັດເຕີຣີຫຼາຍເກີນໄປ, ອຸປະກອນຂອງທ່ານຈະແນະນຳຄຳສັ່ງທີ່ທ່ານສາມາດໃຊ້ໄດ້.\n\nທ່ານສາມາດເປີດໃຊ້ຕົວປະຢັດແບັດເຕີຣີໄດ້ຕະຫຼອດເວລາຫາກແບັດເຕີຣີຂອງທ່ານເຫຼືອໜ້ອຍ."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ຕົວຈັດການແບັດເຕີຣີ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ຈັດການແອັບໂດຍອັດຕະໂນມັດ"</string>
-    <string name="smart_battery_summary" msgid="1339184602000004058">"ຈຳກັດແອັບເຕີຣີສຳລັບແອັບທີ່ທ່ານບໍ່ໄດ້ໃຊ້ເລື້ອຍໆ"</string>
+    <string name="smart_battery_summary" msgid="1339184602000004058">"ຈຳກັດແບັດເຕີຣີສຳລັບແອັບທີ່ທ່ານບໍ່ໄດ້ໃຊ້ເລື້ອຍໆ"</string>
     <string name="smart_battery_footer" product="default" msgid="5555604955956219544">"ເມື່ອຕົວປະຢັດແບັດເຕີຣີກວດພົບວ່າມີແອັບທີ່ກຳລັງໃຊ້ແບັດເຕີຣີຫຼາຍເກີນໄປຢູ່, ທ່ານຈະມີຕົວເລືອກໃນການຈຳກັດແອັບເຫຼົ່ານີ້ໄວ້. ແອັບທີ່ຖືກຈຳກັດອາດເຮັດວຽກບໍ່ຖືກຕ້ອງ ແລະ ການແຈ້ງເຕືອນອາດຊັກຊ້າ."</string>
     <string name="smart_battery_footer" product="tablet" msgid="5555604955956219544">"ເມື່ອຕົວປະຢັດແບັດເຕີຣີກວດພົບວ່າມີແອັບທີ່ກຳລັງໃຊ້ແບັດເຕີຣີຫຼາຍເກີນໄປຢູ່, ທ່ານຈະມີຕົວເລືອກໃນການຈຳກັດແອັບເຫຼົ່ານີ້ໄວ້. ແອັບທີ່ຖືກຈຳກັດອາດເຮັດວຽກບໍ່ຖືກຕ້ອງ ແລະ ການແຈ້ງເຕືອນອາດຊັກຊ້າ."</string>
     <string name="smart_battery_footer" product="device" msgid="5555604955956219544">"ເມື່ອຕົວປະຢັດແບັດເຕີຣີກວດພົບວ່າມີແອັບທີ່ກຳລັງໃຊ້ແບັດເຕີຣີຫຼາຍເກີນໄປຢູ່, ທ່ານຈະມີຕົວເລືອກໃນການຈຳກັດແອັບເຫຼົ່ານີ້ໄວ້. ແອັບທີ່ຖືກຈຳກັດອາດເຮັດວຽກບໍ່ຖືກຕ້ອງ ແລະ ການແຈ້ງເຕືອນອາດຊັກຊ້າ."</string>
@@ -3735,7 +3762,7 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ແອັບແບບເຕັມ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ອຸ​ປະ​ກອນແບບເຕັມ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ສະແດງການນຳໃຊ້ແອັບ"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ເຮັດວຽກຜິດປົກກະຕິ</item>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"ອັບເດດໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ຢຸດການແຈ້ງເຕືອນຊົ່ວຄາວເພື່ອໃຫ້ມີສະມາທິ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ໄດ້"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ມັນຈະເຮັດໃຫ້ໂທລະສັບໜ່ວຍນີ້ຊ້າລົງ"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ບັງຄັບການກວດສອບ GNSS ເຕັມຮູບແບບ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ຕິດຕາມກຸ່ມ ແລະ ຄວາມຖີ່ GNSS ທັງໝົດໂດຍບໍ່ມີຮອບຕາມພັນທະ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"ອະນຸຍາດໃຫ້ການເຄື່ອນໄຫວໃນພື້ນຫຼັງເລີ່ມຕົ້ນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 243aff5..5b0e274 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -378,7 +378,12 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
     <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Naudoti vietovę"</string>
     <string name="location_settings_summary_location_off" msgid="794370259612167176">"Išjungti"</string>
-    <!-- no translation found for location_settings_summary_location_on (5513447650619485188) -->
+    <plurals name="location_settings_summary_location_on" formatted="false" msgid="5513447650619485188">
+      <item quantity="one">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programa gali pasiekti vietovę</item>
+      <item quantity="few">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programos gali pasiekti vietovę</item>
+      <item quantity="many">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programos gali pasiekti vietovę</item>
+      <item quantity="other">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programų gali pasiekti vietovę</item>
+    </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="8523775367089431611">"Įkeliama…"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
@@ -400,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Veidas pridėtas"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Palieskite, kad nust. veido autentifik."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Veido autentifikavimas"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Naud. pritaikymo neįgal. sąranką"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -410,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Naudokite veidą, norėdami atrakinti telefoną, įgalioti pirkimo veiksmus arba prisijungti prie programų."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas veidu.\n\nPastaba: negalite atrakinti šio įrenginio veidu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Naudokite veidą, norėdami atrakinti telefoną, įgalioti pirkimo veiksmus arba prisijungti prie programų"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Veidas turi būti apskritimo centre"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Atlikti vėliau"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Galite pridėti daugiausia tiek veidų: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -1611,7 +1623,7 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Atkuriami numatytieji APN nustatymai."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nust."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"Nustatyti parinktis iš naujo"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Nustat. parinkt. iš naujo"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"Tinklą, programas arba įrenginį galima nustatyti iš naujo"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Iš naujo nustatyti „Wi-Fi“, mobiliųjų duomenų ir „Bluetooth“ nustatymus"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bus iš naujo nustatyti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
@@ -1693,7 +1705,12 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darbo profilio vieta"</string>
     <string name="location_app_level_permissions" msgid="2777033567595680764">"Programos leidimas"</string>
     <string name="location_app_permission_summary_location_off" msgid="2790918244874943070">"Vietovė išjungta"</string>
-    <!-- no translation found for location_app_permission_summary_location_on (5336807018727349708) -->
+    <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="5336807018727349708">
+      <item quantity="one"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
+      <item quantity="few"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
+      <item quantity="many"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
+      <item quantity="other"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
+    </plurals>
     <string name="location_category_recent_location_access" msgid="4911449278675337490">"Pastaroji vietovės prieiga"</string>
     <string name="location_recent_location_access_view_details" msgid="1955078513330927035">"Žr. išsamią informaciją"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
@@ -2094,8 +2111,7 @@
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Ekrano skaitytuvas pirmiausia skirtas akliems ar regos sutrikimų turintiems žmonėms"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Palieskite elementus ekrane, kad jie būtų skaitomi balsu"</string>
-    <!-- no translation found for accessibility_captioning_title (8068289534732163115) -->
-    <skip />
+    <string name="accessibility_captioning_title" msgid="8068289534732163115">"Subtitrų nuostatos"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Didinimas"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Didinti palietus tris kartus"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Didinti naudojant mygtuką"</string>
@@ -2234,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Žalsvai mėlyna"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Geltona"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Purpurinė"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Kadangi programa užstoja leidimo užklausą, nustatymuose negalima patvirtinti jūsų atsakymo."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jei įjungsite „<xliff:g id="SERVICE">%1$s</xliff:g>“, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
@@ -2243,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti PIN kodą."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti slaptažodį."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ nori valdyti visas šio įrenginio funkcijas. Paslauga gali skaityti ekraną ir veikti specialiųjų poreikių turinčių naudotojų vardu. Šis valdymo lygis nėra tinkamas daugumai programų."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Sustabdyti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Palietus „Gerai“ bus sustabdyta „<xliff:g id="SERVICE">%1$s</xliff:g>“."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nėra įdiegta jokių paslaugų"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nepasirinkta jokia paslauga"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
@@ -3315,8 +3351,7 @@
     <string name="zen_mode_block_effect_status" msgid="1651527249762752921">"Slėpti būsenos juostos piktogramas ekrano viršuje"</string>
     <string name="zen_mode_block_effect_badge" msgid="214553506070597320">"Slėpti pranešimų taškus programų piktogramose"</string>
     <string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"Nepažadinti gavus pranešimų"</string>
-    <!-- no translation found for zen_mode_block_effect_list (4722887783222298295) -->
-    <skip />
+    <string name="zen_mode_block_effect_list" msgid="4722887783222298295">"Slėpti išskleidžiamajame skydelyje"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="2617875282623486256">"Niekada"</string>
     <string name="zen_mode_block_effect_summary_screen_off" msgid="1230265589026355094">"Kai ekranas išjungtas"</string>
     <string name="zen_mode_block_effect_summary_screen_on" msgid="6017536991063513394">"Kai ekranas įjungtas"</string>
@@ -3508,7 +3543,7 @@
     <string name="no_vr_listeners" msgid="2689382881717507390">"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="8309673749124927122">"Leisti „<xliff:g id="SERVICE">%1$s</xliff:g>“ pasiekti virtualiosios realybės paslaugą?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"„<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>“ galės veikti, kai programas naudosite virtualiosios realybės režimu."</string>
-    <string name="display_vr_pref_title" msgid="8104485269504335481">"Kai įrenginys veikia virtualiosios realybės režimu"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"Kai įrenginys veikia VR režimu"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Sumažinti suliejimą (rekomenduojama)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Sumažti mirgėjimą"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Vaizdas vaizde"</string>
@@ -3621,11 +3656,9 @@
       <item quantity="many">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontakto</item>
       <item quantity="other">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktų</item>
     </plurals>
-    <!-- no translation found for zen_mode_messages (6406892731721926170) -->
-    <skip />
+    <string name="zen_mode_messages" msgid="6406892731721926170">"Leisti pranešimus"</string>
     <string name="zen_mode_messages_footer" msgid="2616568463646674149">"Kad užtikrintumėte, jog įrenginys skambės priimant leidžiamus pranešimus, patikrinkite, ar jame nustatytas skambėjimo, vibravimo ar begarsis režimas."</string>
-    <!-- no translation found for zen_mode_custom_messages_footer (800067279796770040) -->
-    <skip />
+    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"Veikiant „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ blokuojami gaunami pranešimai. Galite koreguoti nustatymus ir leisti draugams, šeimos nariams ar kitiems kontaktams jus pasiekti."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS ir pranešimų programos"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Iš bet ko"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Tik iš kontaktų"</string>
@@ -4467,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atnaujinti netrukdymo režimą"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pristabdyti pranešimus, kad neblaškytų dėmesio"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ši funkcija negalima"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ją įjungus telefonas veiks lėčiau"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Priversti vykdyti visus GNSS matavimus"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Leisti pradėti veiklą fone"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 62b7a6b..edf974a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Seja pievienota"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Pieskarieties, lai iest. sejas autentif."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Sejas autentificēšana"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Izmantot pieejamības iestatīšanu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Varat izmantot seju, lai atbloķētu tālruni, apstiprinātu pirkumus un pierakstītos lietotnēs."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Izmantojiet sejas atpazīšanu, lai atbloķētu savu tālruni vai apstiprinātu pirkumus.\n\nPiezīme. Sejas atpazīšanu nevar izmantot šīs ierīces atbloķēšanai. Lai iegūtu plašāku informāciju, sazinieties ar savas organizācijas administratoru."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Varat izmantot seju, lai atbloķētu tālruni, apstiprinātu pirkumus un pierakstītos lietotnēs"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrējiet seju aplī"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Vēlāk"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Varat pievienot ne vairāk kā <xliff:g id="COUNT">%d</xliff:g> sejas."</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Ciānzila"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Dzeltena"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Fuksīnsarkana"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Lietotne Iestatījumi nevar verificēt jūsu atbildi, jo cita lietotne aizsedz atļaujas pieprasījumu."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ja ieslēgsiet pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina savs PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava parole."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Pakalpojums <xliff:g id="SERVICE">%1$s</xliff:g> pieprasa pilnīgu šīs ierīces kontroli. Pakalpojums var piekļūt ekrānā redzamajai informācijai un veikt darbības to lietotāju vārdā, kuriem ir īpašas vajadzības. Šāda līmeņa kontrole vairākumam lietotņu nav nepieciešama."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vai apturēt <xliff:g id="SERVICE">%1$s</xliff:g> darbību?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Pieskaroties pogai Labi, tiks apturēta pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbība."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nav instalēts neviens pakalpojums."</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nav atlasīts neviens pakalpojums"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atjaunināt iestatījumu “Netraucēt”"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pārtraukt paziņojumus, lai ilglaicīgi koncentrētos"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Šī funkcija šajā ierīcē nav pieejama."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Šī funkcija nav pieejama."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Tiks palēnināts šī tālruņa darbības ātrums."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Veikt pilnus GNSS mērījumus"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Izsekot visas GNSS konstelācijas un frekvences bez darba cikliem"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Atļaut darbību sākšanu fonā"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1110305..3de1bd1 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Додадено е лице"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Допрете за да поставите проверка на лице"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Проверка на лице"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Поставување на пристапноста"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Користете го лицето за отклучување на телефонот, за одобрување купувања или за најавување на апликации."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Користете го вашето лице за да го отклучите телефонот или да ги одобрите купувањата.\n\nЗабелешка: не може да го користите лицето за да го отклучите уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Користете го лицето за отклучување на телефонот, за одобрување купувања или за најавување на апликации"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Центрирајте го лицето во кругот"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Направи подоцна"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Може да додадете до <xliff:g id="COUNT">%d</xliff:g> лица"</string>
@@ -1827,7 +1834,7 @@
     <string name="total_size_label" msgid="1048676419552557254">"Вкупно"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Големина на апликација"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Апликација за USB меморија"</string>
-    <string name="data_size_label" msgid="6117971066063850416">"Податоци за корисникот"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Податоци на корисникот"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Податоци на USB меморија"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"СД картичка"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталирај"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Цијан"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Жолта"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Користи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Бидејќи апликацијата го прикрива барањето за дозвола, Поставките не може да го потврдат вашиот одговор."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако вклучите <xliff:g id="SERVICE">%1$s</xliff:g>, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да го потврдите PIN-кодот."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите лозинката."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> бара целосна контрола на уредов. Услугава може да го чита екранот и да делува во име на корисниците со потреба за пристапност. Ова ниво на контрола не е соодветно за повеќето апликации."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Запри <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Допри „Во ред“ и <xliff:g id="SERVICE">%1$s</xliff:g> ќе запре."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Нема инсталирано услуги"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Нема избрана услуга"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Не е обезбеден опис."</string>
@@ -2239,7 +2266,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Повеќе информации за печатачот"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Што ја користеше батеријата"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Подат. за батерија се недост."</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Податоците за батеријата се недостапни"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Преостануваат <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до полнење"</string>
@@ -2766,7 +2793,7 @@
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA сертификат"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Сертификат за IPSec сервер"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Прикажи напредни опции"</string>
-    <string name="vpn_search_domains" msgid="5391995501541199624">"Домени на пребарување на ДНС"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Домени на пребарување на DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS сервери (на пр., 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Маршрути за проследување (на пр., 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Корисничко име"</string>
@@ -4003,8 +4030,8 @@
     <string name="configure" msgid="1029654422228677273">"Конфигурирај"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Други апликации вклучени во употребата"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозвола да користи неограничен интернет кога е вклучен Штедачот на интернет</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апликации имаат дозвола да користат неограничен интернет кога е вклучен Штедачот на интернет</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозвола да користи неограничен интернет кога е вклучен „Штедачот на интернет“</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апликации имаат дозвола да користат неограничен интернет кога е вклучен „Штедачот на интернет“</item>
     </plurals>
     <string name="data_usage_title" msgid="3659356290392241789">"Примарни податоци"</string>
     <string name="data_usage_wifi_title" msgid="7063659423081820720">"Wi‑Fi-сообраќај"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирање на режимот „Не вознемирувај“"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте ги известувањата за да останете фокусирани"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Функцијава не е достапна"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ќе го забави телефонот"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Присилување целосни мерења со GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Дозволи стартувања на активноста во заднина"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 64d9a51..37633e0 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"മുഖം ചേർത്തു"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"മുഖം പരിശോധിച്ചുറപ്പിക്കൽ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ഉപയോഗസഹായി സജ്ജീകരണം ഉപയോഗിക്കുക"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾ അംഗീകരിക്കാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുക."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫെയ്‌സ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ഫെയ്‌സ് ഉപയോഗിക്കാനാവില്ല. കൂടുതൽ വിവരങ്ങൾക്ക് ഓർഗനൈസേഷന്റെ അഡ്‌മിനെ ബന്ധപ്പെടുക."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾ അംഗീകരിക്കാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുക"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"നിങ്ങളുടെ ഫെയ്‌സ് വൃത്തത്തിനുള്ളിൽ കേന്ദ്രീകരിക്കുക"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ഇത് പിന്നീട് ചെയ്യുക"</string>
     <string name="face_add_max" msgid="4408683751143942949">"നിങ്ങൾക്ക് <xliff:g id="COUNT">%d</xliff:g> വരെ ഫെയ്‌സുകൾ ചേർക്കാനാവും"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"സിയാൻ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"മഞ്ഞ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"മജന്ത"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ഇവ ആവശ്യമാണ്:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"അനുമതി അഭ്യർത്ഥനയെ ഒരു അപ്ലിക്കേഷൻ മറയ്‌ക്കുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ പ്രതികരണം പരിശോധിച്ചുറപ്പിക്കാനാകില്ല."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കിയെങ്കിൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ PIN സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാസ്‌വേഡ് സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>, ഈ ഉപകരണത്തിന്റെ പൂർണ്ണ നിയന്ത്രണം അഭ്യർത്ഥിക്കുന്നു. ഉപയോഗസഹായം ആവശ്യമുള്ള ഉപയോക്താക്കൾക്ക് വേണ്ടി, സ്ക്രീനിലുള്ളത് വായിക്കാനും അവർക്ക് വേണ്ടി പ്രവർത്തിക്കാനും സേവനത്തിന് കഴിയും. മിക്ക ആപ്പുകളിലും ഈ തലത്തിലുള്ള നിയന്ത്രണം ഉചിതമല്ല."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> നിർത്തണോ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ശരി എന്നതിൽ ടാപ്പ് ചെയ്താൽ <xliff:g id="SERVICE">%1$s</xliff:g> നിലയ്ക്കും."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"സേവനങ്ങളൊന്നും ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ഒരു സേവനവും തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"വിവരണമൊന്നും നൽകിയിട്ടില്ല."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ശല്യപ്പെടുത്തരുത്\' അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ഫോക്കസ് ചെയ്‌ത നിലയിൽ തുടരാൻ, അറിയിപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ഈ ഫീച്ചർ ലഭ്യമല്ല"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ഇത് നിങ്ങളുടെ ഫോണിൻ്റെ വേഗത കുറയ്‌ക്കും"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്‌റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"പ്രവർത്തനം ആരംഭിക്കുന്നതിനുള്ള പശ്ചാത്തല ആക്റ്റിവിറ്റി"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ec410d6..f5b9bd9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Царай нэмсэн"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Царайны баталгаажуулалтыг тохируулахын тулд товшино уу"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Царайны баталгаажуулалт"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Хүртээмжийн тохируулгыг ашиглах"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэхдээ царайгаа ашиглана уу."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Утасныхаа түгжээг тайлах эсвэл худалдан авалтыг зөвшөөрөхийн тулд царайгаа ашиглана уу.\n\nСанамж: Та энэ төхөөрөмжийн түгжээг тайлахын тулд царайгаа ашиглах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэхдээ царайгаа ашиглана уу"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Царайгаа дугуй хүрээнд голлуулна уу"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Дараа бүртгүүлэх"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх царай нэмж болно"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Шар хөх"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Шар"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Улаан"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> шаардлага:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Апп нь зөвшөөрөл авах хүсэлтийг танихгүй байгаа тул Тохиргооноос таны хариултыг баталгаажуулж чадахгүй байна."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Хэрэв та <xliff:g id="SERVICE">%1$s</xliff:g>-г асаавал таны төхөөрөмж дата шифрлэлтийг сайжруулах дэлгэцийн түгжээг ашиглахгүй."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та PIN-ээ баталгаажуулах шаардлагатай."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та нууц үгээ баталгаажуулах шаардлагатай."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> энэ төхөөрөмжийг бүрэн хянах хүсэлтэй байна. Энэ үйлчилгээ дэлгэцийг уншиж, хүртээмжийн үйлчилгээ шаардлагатай хэрэглэгчдийн өмнөөс үйлдэл хийх боломжтой. Энэ түвшний хяналт нь ихэнх аппад тохиромжгүй."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> зогсоох уу?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ТИЙМ гэснийг дарснаар <xliff:g id="SERVICE">%1$s</xliff:g>-г зогсоох болно."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Үйлчилгээ суулгагдаагүй байна"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Үйлчилгээ сонгоогүй байна"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Тайлбар байхгүй."</string>
@@ -4311,8 +4338,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Бүү саад бол горимыг шинэчлэх"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Төвлөрсөн хэвэрэ байхын тулд мэдэгдлийг түр зогсоох"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Энэ онцлог энэ төхөөрөмжид боломжгүй"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Энэ онцлог боломжгүй байна"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Энэ нь энэ утсыг удаашруулна"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Бүтэн GNSS хэмжилтийг хүчлэх"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Бүх GNSS орд болон давтамжийг давтамжийн түвшингүйгээр шинжлэх"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Арын үйл ажиллагааг эхлүүлэхийг зөвшөөрөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b193852..7c19f66 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -128,7 +128,7 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"पेअरींग विनंती"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडण्यासाठी टॅप करा."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिळालेल्या फायली"</string>
-    <string name="bluetooth_show_files_received_via_bluetooth" msgid="5445105773989432594">"फायली ब्ल्यूटूथद्वारे मिळाल्या आहेत"</string>
+    <string name="bluetooth_show_files_received_via_bluetooth" msgid="5445105773989432594">"फायली ब्लूटूथद्वारे मिळाल्या आहेत"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लूटूथ डिव्हाइस निवडा"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ बंद करू इच्छितो"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"चेहरा जोडला आहे"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"फेस ऑथेंटिकेशन सेट करण्यासाठी टॅप करा"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"फेस ऑथेंटिकेशन"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"अ‍ॅक्सेसिबिलिटी सेटअप वापरा"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचा चेहरा वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहरा वापरू शकत नाही. अधिक माहितीसाठी, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा अॅप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"तुमचा चेहरा वर्तुळाच्या मध्यभागी ठेवा"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"हे नंतर करा"</string>
     <string name="face_add_max" msgid="4408683751143942949">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत चेहरे जोडू शकता"</string>
@@ -805,7 +812,7 @@
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"जास्तीत जास्त कनेक्ट होऊ शकणार्‍या ऑडिओ डिव्हाइसची संख्या निवडा"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्‍ट करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
-    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइस आढळली नाहीत."</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"जवळपास कोणतीही डिव्हाइस आढळली नाहीत."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट करत आहे"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट केले"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"वापरात आहे"</string>
@@ -866,7 +873,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"वापरण्‍यासाठी, सुसंगत नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे इंस्टॉल करा"</string>
-    <string name="wifi_scan_notify_text" msgid="5544778734762998889">"अॅप्स आणि सेवा स्थान अचूकता सुधारण्यासाठी वाय-फाय बंद असतानाही वाय-फाय नेटवर्क शोधण्यासाठी कधीही स्कॅन करू शकतात. स्थान-आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासारख्या गोष्टींसाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
+    <string name="wifi_scan_notify_text" msgid="5544778734762998889">"स्थान अचूकता सुधारण्यासाठी अॅप्स आणि सेवा वाय-फाय बंद असतानाही कधीही वाय-फाय नेटवर्क शोधण्यासाठी स्कॅन करू शकतात. स्थानाधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान अचूकता वाढवण्यासाठी, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये वाय-फाय स्कॅनिंग चालू करा."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
@@ -900,7 +907,7 @@
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वयंचलित सेटअप (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"वाय-फाय स्कॅनिंग सुरू करायचे का?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="6352918945128328916">"आपोआप वाय-फाय सुरू करण्यासाठी, तुम्हाला आधी वाय-फाय स्कॅनिंग सुरू करण्याची आवश्यकता आहे."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"वाय फाय स्कॅनिंग हे अॅप्स आणि सेवांना वाय फाय बंद असतानाही कोणत्याही वेळी वाय फाय नेटवर्कसाठी स्कॅन करण्याची अनुमती देते. उदाहरणार्थ, स्थान-आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी हे वापरले जाऊ शकते."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"वाय फाय स्कॅनिंग हे अॅप्स आणि सेवांना वाय-फाय बंद असतानाही कोणत्याही वेळी वाय-फाय नेटवर्कसाठी स्कॅन करण्याची अनुमती देते. उदाहरणार्थ, स्थान-आधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"सुरू करा"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="5527653791584018157">"वाय फाय स्कॅनिंग सुरू केले आहे"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"प्रगत पर्याय"</string>
@@ -972,7 +979,7 @@
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"या नेटवर्कमध्ये डिव्हाइस जोडण्यासाठी QR कोड वापरा"</string>
     <string name="retry" msgid="6472609612090877557">"पुन्हा प्रयत्न करा"</string>
     <string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह शेअर करा"</string>
-    <string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(अजून तेच आहे)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया निवडा"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्रे जोडली)"</string>
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रे वापरा"</string>
@@ -1416,7 +1423,7 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"संचयन स्थान संपत आहे"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"पुनर्नामित करा"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"नाव बदला"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"माउंट करा"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"बाहेर काढा"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"फॉर्मेट करा"</string>
@@ -2189,7 +2196,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"हिरवट निळा"</string>
     <string name="color_yellow" msgid="9112680561610873529">"पिवळा"</string>
     <string name="color_magenta" msgid="5059212823607815549">"किरमिजी तांबडा"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायचे?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
@@ -2198,8 +2206,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>या डिव्हाइसच्या पूर्ण नियंत्रणासाठी विनंती करत आहे. सेवा स्क्रीन रीड करू शकते आणि अ‍ॅक्सेसिबिलिटीच्या गरजा असलेल्या वापरकर्त्यांच्या वतीने कृती करू शकते. नियंत्रणाची ही पातळी बहुतांश अ‍ॅप्ससाठी योग्य नाही."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> थांबवायचे?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ठीक आहेवर टॅप करण्यामुळे <xliff:g id="SERVICE">%1$s</xliff:g> थांबेल."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"सेवा इंस्टॉल केल्या नाहीत"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"कोणतीही सेवा निवडलेली नाही"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"वर्णन प्रदान केले नाही."</string>
@@ -2253,7 +2280,7 @@
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तुम्‍ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअ‍ॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज झाल्यानंतरचा स्क्रीन वापर"</string>
-    <string name="power_usage_list_summary" msgid="5584049564906462506">"पूर्ण चार्ज केल्यापासून बॅटरी वापर"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"पूर्ण चार्ज केल्यापासूनचा बॅटरी वापर"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
@@ -2752,7 +2779,7 @@
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मीटर केलेली नेटवर्क निवडण्‍यासाठी, वाय-फाय चालू करा."</string>
     <string name="data_usage_metered_auto" msgid="1262028400911918865">"स्वयंचलित"</string>
     <string name="wifi_metered_title" msgid="5536703738895222444">"नेटवर्कचा वापर"</string>
-    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मीटरने मोजले"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मर्यादित डेटा वापराचे नेटवर्क"</string>
     <string name="data_usage_metered_no" msgid="4025232961929071789">"मीटरने मोजले नाही"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"वाहक डेटा गणना तुमच्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आणीबाणीचा कॉल"</string>
@@ -3782,7 +3809,7 @@
     <string name="usb_default_info" msgid="8864535445796200695">"दुसरे डिव्हाइस कनेक्ट केलेले असताना आणि तुमचा फोन अनलॉक केलेला असतना, या सेटिंग्ज लागू होतील. फक्त विश्वसनीय डिव्हाइसशी कनेक्ट करा."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_preference" msgid="7394265019817945275">"USB प्राधान्ये"</string>
-    <string name="usb_control_title" msgid="4404322722995917160">"USB नियंत्रक"</string>
+    <string name="usb_control_title" msgid="4404322722995917160">"USB वर यांचे नियंत्रण आहे"</string>
     <string name="usb_control_host" msgid="2276710819046647200">"कनेक्ट केलेले डिव्हाइस"</string>
     <string name="usb_control_device" msgid="5821511964163469463">"हे डिव्हाइस"</string>
     <string name="usb_switching" msgid="8995313698715545619">"स्विच करत आहे..."</string>
@@ -3903,7 +3930,7 @@
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"अंतर्गत स्टोरेज: <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
     <string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> च्या निष्क्रियतेनंतर निष्क्रिय करा"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"वॉलपेपर, निष्क्रिय करा, फॉंट आकार"</string>
-    <string name="display_dashboard_summary_with_style" msgid="870920274423314524">"शैली, वॉलपेपर, स्क्रीन टाइमआउट, फॉन्टचा आकार"</string>
+    <string name="display_dashboard_summary_with_style" msgid="870920274423314524">"शैली, वॉलपेपर, स्क्रीन टाइमआउट, फॉंटचा आकार"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="7840559323355210111">"झोप, फाँटचा आकार"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"10 मिनिटे काहीच अॅक्टिव्हिटी नसेल तर निष्क्रिय करा"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> पैकी सरासरी <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमरी वापरली"</string>
@@ -3950,7 +3977,7 @@
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"रात्रीच्या प्रकाशाचे वेळापत्रक सेट करा"</string>
     <string name="night_display_suggestion_summary" msgid="228346372178218442">"दररोज रात्री स्क्रीन आपोआप टिंट करा"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"रात्रीचा प्रकाश चालू आहे"</string>
-    <string name="condition_night_display_summary" msgid="7150932917610919907">"स्क्रीनची छटा मंद केली आहे"</string>
+    <string name="condition_night_display_summary" msgid="7150932917610919907">"स्क्रीनची छटा मंद पिवळसर केली आहे"</string>
     <string name="condition_grayscale_title" msgid="3426050703427823519">"ग्रेस्केल"</string>
     <string name="condition_grayscale_summary" msgid="7652835784223724625">"फक्त ग्रे रंगात दाखवा"</string>
     <string name="homepage_condition_footer_content_description" msgid="2335918927419018030">"कोलॅप्स करा"</string>
@@ -3976,7 +4003,7 @@
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटा वापर"</string>
     <string name="app_cellular_data_usage" msgid="5468472735806533448">"अ‍ॅप डेटा वापर"</string>
-    <string name="wifi_data_usage" msgid="771603760674507659">"वाय फाय डेटा वापर"</string>
+    <string name="wifi_data_usage" msgid="771603760674507659">"वाय-फाय डेटा वापर"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"इथरनेट डेटा वापर"</string>
     <string name="wifi" msgid="1081550856200013637">"वाय-फाय"</string>
     <string name="ethernet" msgid="6600095783781389720">"इथरनेट"</string>
@@ -4315,8 +4342,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"व्यत्यय आणू नका अपडेट करा"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"लक्ष केंद्रित केलेले राहण्यासाठी सूचना थांंबवा"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्‍ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"हे वैशिष्ट्य उपलब्ध नाही"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"हे तुमच्या फोनला धिमे करेल"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापांची सक्ती करा"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"बॅकग्राउंड अॅक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index cab06cc..a6b3961 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Ketik untuk menyediakan pengesahan wajah"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Pengesahan wajah"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Gunakan persediaan kebolehaksesan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gunakan wajah anda untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gunakan wajah anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Anda tidak boleh menggunakan wajah anda untuk membuka kunci peranti ini. Untuk mendapatkan maklumat lanjut, hubungi pentadbir organisasi anda."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gunakan wajah anda untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Tengahkan wajah anda dalam bulatan"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Lakukan kemudian"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> wajah"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Biru kehijauan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Kuning"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Oleh sebab apl melindungi permintaan kebenaran, Tetapan tidak dapat mengesahkan jawapan anda."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika anda menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g>, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan PIN anda."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan kata laluan anda."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> meminta kawalan sepenuhnya ke atas peranti ini. Perkhidmatan dapat membaca skrin dan bertindak bagi pihak pengguna dengan keperluan kebolehaksesan. Tahap kawalan ini tidak sesuai untuk kebanyakan apl."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tindakan menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tiada perkhidmatan dipasang"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Tiada perkhidmatan yang dipilih"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Kemas Kini Jangan Ganggu"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda pemberitahuan untuk mengekalkan tumpuan"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Video ini tidak tersedia pada peranti ini"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ciri ini tidak tersedia"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ciri akan memperlahan telefon ini"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Paksa ukuran GNSS penuh"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Jejak semua gugusan dan kekerapan GNSS tanpa kitaran tugas"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Benarkan aktiviti latar belakang bermula"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 5e62223..82b5a5b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"မျက်နှာ ထည့်သွင်းပြီး"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"မျက်နှာစိစစ်ခြင်း သတ်မှတ်ရန်တို့ပါ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"မျက်နှာ စိစစ်ခြင်း"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"အများသုံးစွဲနိုင်မှုကို သုံးရန်"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် သင့်မျက်နှာကို အသုံးပြုပါ။"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်မျက်နှာကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်မျက်နှာကို အသုံးပြု၍ မရနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် သင့်မျက်နှာကို အသုံးပြုပါ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"သင့်မျက်နှာကို စက်ဝိုင်းအလယ်တွင်ဖြစ်အောင် ချိန်ပါ"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"နောက်မှလုပ်ရန်"</string>
     <string name="face_add_max" msgid="4408683751143942949">"မျက်နှာ <xliff:g id="COUNT">%d</xliff:g> ခုအထိ ထည့်နိုင်သည်"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"စိမ်းပြာ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"အဝါ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ပန်းခရမ်း"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ကို သုံးမလား။"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ကလုပ်ဆောင်ရန်များ-"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် PIN ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် လျှို့ဝှက်ကုဒ်ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> က ဤကိရိယာကို အပြည့်အဝ ထိန်းချုပ်ခွင့် တောင်းဆိုနေသည်။ ဤဝန်ဆောင်မှုက ဖန်သားပြင်ရှိအရာများကို ဖတ်နိုင်ပြီး အများသုံးစွဲနိုင်မှု လိုအပ်ချက်များသုံး၍ အသုံးပြုသူများကိုယ်စား လုပ်ဆောင်နိုင်သည်။ ဤထိန်းချုပ်မှု အဆင့်သည် အက်ပ်အများစုအတွက် မသင့်လျော်ပါ။"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုရပ်မည်လား?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"အိုကေကို တို့ခြင်းဖြင့် <xliff:g id="SERVICE">%1$s</xliff:g> ရပ်တန့်သွားပါလိမ့်မည်။"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"မည်သည့် ဝန်ဆောင်မှုကိုမျှ ရွေးမထားပါ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"မည်သည့်အကြောင်းအရာမှမရှိပါ"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'မနှောင့်ယှက်ရ\' ကို အပ်ဒိတ်လုပ်ခြင်း"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"အာရုံစူးစိုက်နိုင်ရန် အကြောင်းကြားချက်များကို ခေတ္တရပ်ထားပါ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ဤဝန်ဆောင်မှုကို မရနိုင်ပါ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"၎င်းကြောင့် ဤဖုန်းနှေးသွားပါမည်"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"နောက်ခံ လုပ်ဆောင်ချက် စတင်မှုများ ခွင့်ပြုပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e5b6712..0ef9891 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansiktet er lagt til"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Trykk for å bruke ansiktsautentisering"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Ansiktsautentisering"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Bruk tilgjengelighetsoppsett"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Bruk ansiktet til å låse opp telefonen, godkjenne kjøp eller logge på apper."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Bruk ansiktet ditt til å låse opp telefonen eller godta kjøp.\n\nMerk: Du kan ikke bruke ansiktet til å låse opp denne enheten. Ta kontakt med administratoren for organisasjonen din for å få mer informasjon."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Bruk ansiktet til å låse opp telefonen, godkjenne kjøp eller logge på apper"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Ha ansiktet ditt midt i sirkelen"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gjør det senere"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> ansikter"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> må"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du slår på <xliff:g id="SERVICE">%1$s</xliff:g>, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Du må bekrefte PIN-koden din for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Du må bekrefte passordet ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ber om full kontroll over denne enheten. Tjenesten kan lese skjermen og handle på vegne av brukere med tilgjengelighetsbehov. Dette kontrollnivået er ikke passende for de fleste apper."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Du stopper <xliff:g id="SERVICE">%1$s</xliff:g> ved å trykke på OK."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ingen tjeneste er valgt"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
@@ -3785,7 +3812,7 @@
     <string name="usb_control_device" msgid="5821511964163469463">"Denne enheten"</string>
     <string name="usb_switching" msgid="8995313698715545619">"Bytter …"</string>
     <string name="usb_switching_failed" msgid="4156073015692409651">"Kunne ikke bytte"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Lading av denne enheten"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Lader denne enheten"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Lading av den tilkoblede enheten"</string>
     <string name="usb_summary_file_transfers" msgid="6925168380589489645">"Filoverføring"</string>
     <string name="usb_summary_tether" msgid="951190049557074535">"USB-internettdeling"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Oppdater «Ikke forstyrr»"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sett varsler på pause for å holde deg fokusert"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Denne funksjonen er ikke tilgjengelig"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Den senker hastigheten til telefonen"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tving fullstendige GNSS-målinger"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Tillat start av bakgrunnsaktivitet"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index fc895f4..396998e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"अनुहार थपियो"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"अनुहार प्रमाणीकरण सेटअप गर्न ट्याप गर्नु…"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"अनुहार प्रमाणीकरण"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"पहुँचसम्बन्धी सेटअप प्रयोग गर्नु"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"आफ्नो फोन अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न आफ्नो अनुहार प्रयोग गर्नुहोस्।"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना अनुहारको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो अनुहारको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो सङ्गठनको प्रशासकसँग सम्पर्क गर्नुहोस्।"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"आफ्नो फोन अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न आफ्नो अनुहार प्रयोग गर्नुहोस्"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"आफ्नो अनुहार वृतको बिचमा पार्नुहोस्"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"यो कार्य पछि गर्नुहोस्‌"</string>
     <string name="face_add_max" msgid="4408683751143942949">"तपाईं अधिकतम <xliff:g id="COUNT">%d</xliff:g> अनुहारहरू थप्न सक्नुहुन्छ"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"सायन"</string>
     <string name="color_yellow" msgid="9112680561610873529">"पहेँलो"</string>
     <string name="color_magenta" msgid="5059212823607815549">"म्याजेन्टा"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आवश्यक:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"एपले अनुमति अनुरोधलाई अस्पष्ट मानिरहेको हुनाले, सेटिङहरूलले तपाईंको प्रतिक्रियालाई प्रमाणित गर्न सक्दैनन्।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो PIN पुष्टि गर्न आवश्यक छ।"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेबा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो पासवर्ड पुष्टि गर्न आवश्यक छ।"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ले यो यन्त्र पूर्ण रूपमा नियन्त्रण गर्ने अनुमति माग्दै छ। यो सेवाले स्क्रिनमा भएका जानकारी पढ्न तथा पहुँचसम्बन्धी आवश्यकता भएका प्रयोगकर्ताहरूका तर्फबाट कारबाही गर्न सक्छ। धेरैजसो अनुप्रयोगहरूका हकमा यो स्तरको नियन्त्रण उपयुक्त हुँदैन।"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>बन्द गर्नुहुन्छ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"OK ट्याप गरिँदा <xliff:g id="SERVICE">%1$s</xliff:g>लाई रोक्ने छ।"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कुनै पनि सेवाहरू स्थापित छैनन्"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"कुनै पनि सेवा चयन गरिएको छैन"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"वर्णन प्रदान गरिएको छैन।"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"बाधा नपुर्‍याउनुहोस्‌ नामक सेवालाई अद्यावधिक गर्नुहोस्‌"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"केन्द्रित रहन सूचनाहरू पज गर्नुहोस्"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"यो सुविधा उपलब्ध छैन"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"यो सुविधा प्रयोग गर्नुले फोनको कार्यक्षमता सुस्त पार्ने छ"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"पृष्ठभूमिको क्रियाकलाप सुरु हुने अनुमति दिनुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 04c1409..dd25b1e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gezicht toegevoegd"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tik om gezichtsherkenning in te stellen"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Gezichtsherkenning"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Toegankelijkheidsinst. gebruiken"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gebruik je gezicht om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gebruik je gezicht om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je kunt je gezicht niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gebruik je gezicht om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centreer je gezicht in de cirkel"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Later doen"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> gezichten toevoegen"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyaanblauw"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Geel"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' gebruiken?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' moet het volgende kunnen:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aangezien een app een toestemmingsverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Als je <xliff:g id="SERVICE">%1$s</xliff:g> inschakelt, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet de pincode worden bevestigd."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je wachtwoord bevestigen."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> vraagt om volledig beheer voor dit apparaat. De service kan het scherm lezen en handelen namens gebruikers met toegankelijkheidsbehoeften. Dit beheerniveau is voor de meeste apps niet gepast."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' beëindigen?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Als je op OK tikt, wordt \'<xliff:g id="SERVICE">%1$s</xliff:g>\' beëindigd."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen services geïnstalleerd"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Geen service geselecteerd"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'Niet storen\' updaten"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Meldingen onderbreken om gefocust te blijven"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Deze functie is niet beschikbaar op dit apparaat"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Deze functie is niet beschikbaar"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"De functie vertraagt deze telefoon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Volledige GNSS-metingen afdwingen"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Alle GNSS-constellaties en -frequenties bijhouden zonder duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Starts van activiteit op de achtergrond toestaan"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index b6d6b55..42c9357 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -398,6 +398,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ଫେସ୍‌ ଯୋଡ଼ାଗଲା"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ଫେସ୍‌ର ପ୍ରମାଣ ସେଟଅପ୍‍ ପାଇଁ ଟାପ୍‍ କରନ୍ତୁ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ଫେସ୍‍ ପ୍ରମାଣୀକରଣ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ଆକ୍ସେସିବିଲିଟୀ ସେଟ୍‌ଅପ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -408,7 +413,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ନିଜର ଫୋନ୍‌ ଅନଲକ୍‌ କରିବା ପାଇଁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରନ୍ତୁ, କିଣାକିଣିକଗୁଡ଼ିକୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ, କିମ୍ବା ଆପ୍‌ଗୁଡ଼ିକରେ ସାଇନ୍‌ ଇନ୍‌ କରନ୍ତୁ।"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ମୁହଁର ବ୍ୟବହାର କରନ୍ତୁ।\n\nନୋଟ୍‌ କରନ୍ତୁ: ଏହି ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଆପଣଙ୍କ ମୁହଁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ନିଜର ଫୋନ୍‌ ଅନଲକ୍‌ କରିବା ପାଇଁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରନ୍ତୁ, କିଣାକିଣିକଗୁଡ଼ିକୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ, କିମ୍ବା ଆପ୍‌ଗୁଡ଼ିକରେ ସାଇନ୍‌ ଇନ୍‌ କରନ୍ତୁ।"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ବୃତ୍ତରେ ଆପଣଙ୍କ ମୁହଁ କେନ୍ଦ୍ରରେ ରଖନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ଏହାକୁ ପରେ କରନ୍ତୁ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g>ଟି ମୁହଁ ଯୋଡ଼ିପାରିବେ"</string>
@@ -474,8 +481,8 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ସେନ୍ସର୍‌କୁ ଛୁଅଁନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ନିଜ ଆଙ୍ଗୁଠିକୁ ସେନ୍ସର୍ ଉପରେ ରଖନ୍ତୁ ଏବଂ ଏକ କମ୍ପନ ଅନୁଭବ କରିବା ପରେ ଉଠାଇଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ଉଠାନ୍ତୁ, ତା\'ପରେ ପୁଣି ଛୁଅଁନ୍ତୁ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ନିଜ ଆଙ୍ଗୁଠି ଚିହ୍ନର ବିଭିନ୍ନ ଅଂଶ ଯୋଡ଼ିବା ପାଇଁ ଆଙ୍ଗୁଠି ଉଠାଉଥା’ନ୍ତୁ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ଆଙ୍ଗୁଠି ଚିହ୍ନକୁ ଯୋଡ଼ାଗଲା"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ନିଜ ଟିପଚିହ୍ନର ବିଭିନ୍ନ ଅଂଶ ଯୋଡ଼ିବା ପାଇଁ ଆଙ୍ଗୁଠି ଉଠାଉଥାନ୍ତୁ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ଟିପଚିହ୍ନ ଯୋଡ଼ାଗଲା"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"ଆପଣ ଯେତେବେଳେ ଏହି ଆଇକନ୍‌‌କୁ ଦେଖିବେ, ପରିଚୟ ପାଇଁ କିମ୍ବା କ୍ରୟଗୁଡିକର ମଞ୍ଜୁରୀ ଦେବା ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ଏହାକୁ ପରେ କରନ୍ତୁ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ସେଟଅପ ଛାଡ଼ିଦେବେ?"</string>
@@ -826,7 +833,7 @@
     <string name="art_verifier_for_debuggable_summary" msgid="2250352478065428399">"debuggable ଆପ୍ସ ପାଇଁ bytecode ଯାଞ୍ଚ କରିବାକୁ ART ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ଟାବ୍‌ଲେଟ୍‌ ଅନ୍ୟ ଡିଭାଇସ୍‌କୁ ଛୁଇଁଲେ ଡାଟା ଆଦାନପ୍ରଦାନର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ଫୋନ୍‌ଟି ଅନ୍ୟ ଡିଭାଇସ୍‌କୁ ଛୁଇଁଲେ ଡାଟା ପ୍ରତିବଦଳ କରିପାରିବ"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ଫୋନ୍‌ଟି ଅନ୍ୟ ଡିଭାଇସ୍‌କୁ ଛୁଇଁଲେ ଡାଟା ପ୍ରତିବଦଳର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC ଅନ୍ କରନ୍ତୁ"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ଏହି ଡିଭାଇସ୍‌ ଏବଂ ଅନ୍ୟ ନିକଟସ୍ଥ ଡିଭାଇସ କିମ୍ବା ଧାର୍ଯ୍ୟ, ଯେପରିକି ଦେୟ ଟର୍ମିନାଲ୍‌ସ, ଆକସେସ୍‌ ରିଡରସ୍, ଏବଂ ଇଣ୍ଟରାକ୍ଟିଭ ଆଡସ୍‌ କିମ୍ବା ଟ୍ୟାଗସ୍‌ ମଧ୍ୟରେ ଡାଟା ପ୍ରତିବଦଳ କରେ।"</string>
     <string name="nfc_secure_settings_title" msgid="150400737244061585">"NFC ସୁରକ୍ଷିତ କରନ୍ତୁ"</string>
@@ -850,7 +857,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"ତ୍ରୁଟି"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ଏହି ଦେଶରେ 5 GHz ବ୍ୟାଣ୍ଡ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ଏୟାରପ୍ଲେନ୍‌ ମୋଡ୍‌ରେ"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ଖୋଲା ନେଟ୍‌ୱର୍କ ବିଜ୍ଞପ୍ତି"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ଓପନ୍ ନେଟ୍‌ୱାର୍କ ବିଜ୍ଞପ୍ତି"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"ଏକ ଉଚ୍ଚ-ଗୁଣବତ୍ତା ବିଶିଷ୍ଟ ପବ୍ଲିକ୍‌ ନେଟ୍‌ୱର୍କ ଉପଲବ୍ଧ ଥିବାବେଳେ ସୂଚିତ କରନ୍ତୁ"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"ୱାଇ-ଫାଇ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ଆପଣଙ୍କର ହୋମ୍ ନେଟ୍‌ୱର୍କ ଭଳି ସେଭ୍ ହୋଇଥିବା ଉଚ୍ଚ କ୍ୱାଲିଟୀର ନେଟ୍‌ୱର୍କଗୁଡ଼ିକ ନିକଟରେ ୱାଇ-ଫାଇ ପୁଣିଥରେ ଅନ୍ ହେବ"</string>
@@ -860,7 +867,7 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ଦୁର୍ବଳ ସଂଯୋଗଗୁଡ଼ିକୁ ଏଡ଼ାଅ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"ଉତ୍ତମ ଇଣ୍ଟର୍‌ନେଟ୍‌ ସଂଯୋଗ ନଥିଲେ ୱାଇ-ଫାଇ ନେଟ୍‌ୱର୍କ ବ୍ୟବହାର କରନ୍ତୁ ନାହିଁ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"କେବଳ ଭଲ ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଗ ଥିବା ନେଟ୍‌ୱର୍କଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ଖୋଲା ନେଟ୍‌ୱାର୍କ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ଓପନ୍ ନେଟ୍‌ୱାର୍କ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ଉତ୍ତମ କ୍ୱାଲିଟୀର ସାର୍ବଜନୀନ ନେଟ୍‌ୱାର୍କ ସହ ସ୍ୱଚାଳିତ ଭାବେ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ବ୍ୟବହାର କରିବା ପାଇଁ ଏକ ନେଟ୍‌ୱର୍କ ରେଟିଙ୍ଗ୍‌ ପ୍ରଦାତା ବାଛନ୍ତୁ"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ବ୍ୟବହାର କରିବା ପାଇଁ, ଏକ ଅନୁକୂଳ ନେଟ୍‌ୱର୍କ ରେଟିଙ୍ଗ ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"</string>
@@ -912,7 +919,7 @@
     <string name="wifi_hidden_network_warning" msgid="6674068093531603452">"ଯଦି ଆପଣଙ୍କ ରାଉଟର୍ ଗୋଟିଏ ନେଟ୍‌ୱର୍କ IDକୁ ପ୍ରସାରଣ ନକରେ କିନ୍ତୁ ଭବିଷ୍ୟତରେ ଆପଣ ତାହା ସହିତ କନେକ୍ଟ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣ ନେଟ୍‌ୱର୍କକୁ ଲୁକ୍କାୟିତ ଭାବେ ସେଟ୍ କରିପାରିବେ। \n\n ଏହା ଗୋଟିଏ ସୁରକ୍ଷା ପ୍ରଶ୍ନବାଚୀ ସୃଷ୍ଟି କରିପାରେ, କାରଣ ଆପଣଙ୍କ ଫୋନ୍ ନେଟ୍‌ୱର୍କ ପ୍ରାପ୍ତ କରିବା ପାଇଁ ନିୟମିତ ଭାବେ ନିଜର ସିଗନାଲ୍‌କୁ ପ୍ରସାରିତ କରିବ। \n\nଲୁକ୍କାୟିତ ଭାବେ ନେଟୱର୍କକୁ ସେଟ୍ କରିବା ଦ୍ଵାରା ରାଉଟର୍‌ର ସେଟିଙ୍ଗ ବଦଳିବ ନାହିଁ।"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"ସିଗ୍ନାଲ୍‌ର ଶକ୍ତି"</string>
     <string name="wifi_status" msgid="4824568012414605414">"ସ୍ଥିତି"</string>
-    <string name="tx_wifi_speed" msgid="2994278184097786511">"ଲିଙ୍କ୍ ଗତି ସଞ୍ଚାରିତ କରନ୍ତୁ"</string>
+    <string name="tx_wifi_speed" msgid="2994278184097786511">"ଟ୍ରାନ୍ସମିଟ୍ ଲିଙ୍କ୍ ବେଗ"</string>
     <string name="rx_wifi_speed" msgid="7206089638282839236">"ଲିଙ୍କ୍ ସ୍ପିଡ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"ଫ୍ରିକ୍ୱେନ୍ସୀ"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP ଠିକଣା"</string>
@@ -939,7 +946,7 @@
     <string name="wifi_privacy_settings" msgid="5500777170960315928">"ଗୋପନୀୟତା"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="1539659414108891004">"ଅନିୟମିତ MAC"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8674936581557695411">"ଏକ ଡିଭାଇସ୍‍ ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"ଏହି “<xliff:g id="SSID">%1$s</xliff:g>”ରେ ଯୋଗ କରିବା ପାଇଁ ନିମ୍ନରେ ଥିବା QR କୋଡ୍‍କୁ କେନ୍ଦ୍ରକୁ ଆଣନ୍ତୁ"</string>
+    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"ଏହି “<xliff:g id="SSID">%1$s</xliff:g>”ରେ ଡିଭାଇସ୍ ଯୋଗ କରିବା ପାଇଁ ନିମ୍ନରେ ଥିବା QR କୋଡ୍‍କୁ କେନ୍ଦ୍ରକୁ ଆଣନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"QR କୋଡ୍‍ ସ୍କାନ୍‍ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ନିମ୍ନରେ ଥିବା କେନ୍ଦ୍ରକୁ ଆଣନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"ଗୋଟିଏ QR କୋଡ୍ ସ୍କାନ୍‌ କରି ୱାଇ-ଫାଇରେ ଯୋଗ ଦିଅନ୍ତୁ"</string>
@@ -1070,7 +1077,7 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ସହ ସଂଯୋଗ କରିବାକୁ ନିମନ୍ତ୍ରଣକୁ ଆପଣ ବାତିଲ୍‌ କରିବାକୁ ଚାହାଁନ୍ତି କି?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ଏହି ଗ୍ରୁପ୍‌କୁ ଭୁଲିଯିବେ?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍‌"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"ଅନ୍ୟ ଡିଭାଇସ୍‌ ସହ ଇଣ୍ଟର୍ନେଟ୍‌ କିମ୍ବା ବିଷୟବସ୍ତୁ ଶେୟାର କରୁନାହିଁ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"ଅନ୍ୟ ଡିଭାଇସ୍‌ ସହ ଇଣ୍ଟର୍ନେଟ୍‌ କିମ୍ବା ବିଷୟବସ୍ତୁ ସେୟାର୍ କରୁନାହିଁ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"ହଟ୍‌ସ୍ପଟ୍‌ ମାଧ୍ୟମରେ ଏହି ଟାବ୍‌ଲେଟ୍‌ର ଇଣ୍ଟର୍‌ନେଟ୍‌ ସଂଯୋଗ ସେୟାର୍‌ କରୁଛି"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"ହଟସ୍ପଟ୍‌ ମାଧ୍ୟମରେ ଏହି ଫୋନ‌ର ଇଣ୍ଟର୍ନେଟ୍‌ ସଂଯୋଗ ସେୟାର୍‌ କରୁଛି"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"ଆପ୍‍ କଣ୍ଟେଣ୍ଟ ଶେୟର୍ କରୁଛି। ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଜନା ଶେୟାର କରିବାକୁ, ହଟ୍‌ସ୍ପଟ୍‌ ଅଫ୍‌ କରି ଅନ୍‌ କରନ୍ତୁ"</string>
@@ -1563,7 +1570,7 @@
     <string name="mvno_type" msgid="2543253857818336421">"MVNO ପ୍ରକାର"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO ଭାଲ୍ୟୁ"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="menu_new" msgid="3014205883303921729">"ନୁଆ APN"</string>
+    <string name="menu_new" msgid="3014205883303921729">"ନୂଆ APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"ସେଭ୍‌ କରନ୍ତୁ"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"ପରିତ୍ୟାଗ"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
@@ -1636,7 +1643,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"ବ୍ଲୁଟୂଥ୍‍‌ ମାଧ୍ୟମରେ ଏହି <xliff:g id="DEVICE_NAME">%1$d</xliff:g>ର ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଗ ସେୟାର୍‌ କରୁଛି"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ଡିଭାଇସ୍‌ଠାରୁ ଅଧିକ ସହ ଟିଥର୍‌ କରିପାରିବ ନାହିଁ।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ଅନ୍‌ଟିଥର୍ କରାଯିବ"</string>
-    <string name="tethering_footer_info" msgid="7112228674056306147">"ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡିକୁ ଇଣ୍ଟରନେଟ୍‌ ପ୍ରଦାନ କରିବା ପାଇଁ ହଟସ୍ପଟ୍ ବ୍ୟବହାର କରନ୍ତୁ। ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କଣ୍ଟେଣ୍ଟ ସେୟାର୍‌ କରିବାକୁ ଆପ୍‌ଗୁଡ଼ିକ ମଧ୍ୟ ଗୋଟିଏ ହଟ୍‌ସ୍ପଟ୍‌ ତିଆରି କରିପାରିବେ।"</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡିକୁ ଇଣ୍ଟରନେଟ୍‌ ପ୍ରଦାନ କରିବା ପାଇଁ ହଟସ୍ପଟ୍ ଏବଂ ଟିଥରିଂ ବ୍ୟବହାର କରନ୍ତୁ। ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କଣ୍ଟେଣ୍ଟ ସେୟାର୍‌ କରିବାକୁ ଆପ୍‌ଗୁଡ଼ିକ ମଧ୍ୟ ଗୋଟିଏ ହଟ୍‌ସ୍ପଟ୍‌ ତିଆରି କରିପାରିବେ।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ସାହାଯ୍ୟ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱାର୍କ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ମୋବାଇଲ୍‌ ପ୍ଲାନ୍‌"</string>
@@ -1718,7 +1725,7 @@
     <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"ସୁରକ୍ଷା ପାଇଁ ପାସ୍‌ୱର୍ଡ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବା ପାଇଁ ପାସ୍‌ୱାର୍ଡ ସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ବ୍ୟବହାର କରିବା ପାଇଁ ପାଟର୍ନ ସେଟ୍‌ କରନ୍ତୁ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବା ପାଇଁ ପାଟର୍ନ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"ସୁରକ୍ଷା ପାଇଁ PIN ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବା ପାଇଁ PIN ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"ସୁରକ୍ଷା ପାଇଁ ପାଟର୍ନ ସେଟ୍ କରନ୍ତୁ"</string>
@@ -1726,8 +1733,8 @@
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ଆପଣଙ୍କ ପ୍ୟାଟର୍ନ ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ଆପଣଙ୍କ PIN ପୁଣି ଲେଖନ୍ତୁ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ପାସ୍‌ୱର୍ଡ ମେଳ ଖାଉନାହିଁ"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ପିନ୍‌ ମେଳଖାଉନାହିଁ"</string>
-    <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"ଆପଣଙ୍କର ପ୍ୟାଟର୍ନକୁ ପୁନର୍ବାର ଆଙ୍କନ୍ତୁ"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ପିନ୍‌ ମେଳ ଖାଉନାହିଁ"</string>
+    <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"ଆପଣଙ୍କର ପାଟର୍ନ ପୁଣି ଆଙ୍କନ୍ତୁ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ଚୟନ ଅନ୍‌ଲକ୍‌ କରନ୍ତୁ"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ପାସ୍‌ୱର୍ଡକୁ ସେଟ୍‌ କରିଦିଆଗଲା"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ସେଟ୍‌ କରାଯାଇଛି"</string>
@@ -2186,7 +2193,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ସାୟାନ୍"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ହଳଦିଆ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ମାଜେଣ୍ଟା"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ବ୍ୟବହାର କରିବେ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ଆବଶ୍ୟକ କରେ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ଗୋଟିଏ ଏପ ଏକ ଅନୁମତି ଅନୁରୋଧକୁ ଅଣଦେଖା କରୁଥିବା କାରଣରୁ, ସେଟିଙ୍ଗ ଆପଣଙ୍କ ଉତ୍ତରକୁ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ଯଦି ଆପଣ <xliff:g id="SERVICE">%1$s</xliff:g>କୁ ଅନ୍‌ କରନ୍ତି, ତେବେ ଡାଟା ଏନକ୍ରିପ୍ସନ୍‌ ବୃଦ୍ଧି କରିବାକୁ ଆପଣଙ୍କ ଡିଭାଇସ୍‌, ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌କୁ ବ୍ୟବହାର କରିବ ନାହିଁ।"</string>
@@ -2195,8 +2203,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"କାରଣ <xliff:g id="SERVICE">%1$s</xliff:g> କୁ ଅନ୍‌ କଲେ, ତାହା ଡାଟା ଏନ୍‌କ୍ରିପ୍‌ଶନ୍‌କୁ ପ୍ରଭାବିତ କରିବ, ଆପଣଙ୍କୁ ନିଜ PIN ସୁନିଶ୍ଚିତ କରିବାକୁ ପଡ଼ିବ।"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"କାରଣ <xliff:g id="SERVICE">%1$s</xliff:g> ଅନ୍‌ କରିବା ଦ୍ୱାରା ଡାଟା ଏନକ୍ରିପସନ୍‌ ପ୍ରଭାବିତ ହେବ, ତେଣୁ ଆପଣଙ୍କ ପାସୱାର୍ଡ୍ ଆପଣ ନିଶ୍ଚିତ କରିବା ଆବଶ୍ୟକ କରନ୍ତି।"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>, ଏହି ଡିଭାଇସ୍‌ର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଅନୁରୋଧ କରୁଛି। ଏହି ସେବା, ସ୍କ୍ରିନ୍‌ ପଢିପାରିବ ଏବଂ ଆକ୍ସେସିବିଲିଟୀ ଆବଶ୍ୟକତା ଅନୁଯାୟୀ ଉପଯୋଗକର୍ତ୍ତା ତରଫରୁ କାର୍ଯ୍ୟ କରିପାରିବ। ଅଧିକାଂଶ ଆପ୍‌ ପାଇଁ ଏହି ସ୍ତରର ନିୟନ୍ତ୍ରଣ ସଠିକ୍‌ ନୁହେଁ।"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>କୁ ବନ୍ଦ କରିବେ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"OK ରେ ଟାପ୍‌ କଲେ <xliff:g id="SERVICE">%1$s</xliff:g> ବନ୍ଦ କରିଦେବ।"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"କୌଣସି ସେବା ସଂସ୍ଥାପିତ ହୋଇନାହିଁ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"କୌଣସି ସେବାର ଚୟନ କରାଯାଇନାହିଁ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"କୌଣସି ବ୍ୟାଖ୍ୟା ଦିଆଯାଇ ନାହିଁ।"</string>
@@ -2204,8 +2231,8 @@
     <string name="print_settings" msgid="4742428530112487843">"ପ୍ରିଣ୍ଟିଙ୍ଗ"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"ଅଫ୍"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>ଟି ପ୍ରିଣ୍ଟ ସେବା</item>
-      <item quantity="one"> ରେ ୧ଟି ପ୍ରିଣ୍ଟ ସେବା</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>ଟି ପ୍ରିଣ୍ଟ ସେବା ଚାଲୁଛି</item>
+      <item quantity="one">1ଟି ପ୍ରିଣ୍ଟ ସେବା ଚାଲୁଛି</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>ଟି ପ୍ରିଣ୍ଟ ଜବ୍‌</item>
@@ -2436,7 +2463,7 @@
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ଦ୍ୱାରା <xliff:g id="PERCENT">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ମୋଟ ବ୍ୟାଟେରୀର <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ଶେଷଥର ଫୂଲ୍‌ ଚାର୍ଜ ପରଠାରୁ ବ୍ୟାଟେରୀ ବ୍ୟବହାରର ବିବରଣୀ"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"ଶେଷଥର ହୋଇଥିବା ସମ୍ପୂର୍ଣ୍ନ ଚାର୍ଜ"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"ଗତଥର ହୋଇଥିବା ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ"</string>
     <string name="battery_full_charge_last" msgid="8892335687734288031">"ବ୍ୟାଟେରୀ ପୂରା ଚାର୍ଜ ହେବା ପରେ ପାଖାପାଖି ଏତିକି ସମୟ ଚାଲିଥାଏ"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"ବ୍ୟାଟେରୀ ବ୍ୟବହୃତ ଡାଟା ଆନୁମାନିକ ଅଟେ ଏବଂ ବ୍ୟବହାର ଉପରେ ଆଧାର କରି ବଦଳିପାରେ"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ସକ୍ରିୟ ଭାବେ ବ୍ୟବହାରରେ ଥିବାବେଳେ"</string>
@@ -2459,15 +2486,15 @@
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
     <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"କୋଣସି ସୂଚୀ ନାହିଁ"</string>
     <string name="battery_saver_auto_routine" msgid="8076053160450346731">"ଆପଣଙ୍କ ରୁଟିନ୍ ଅନୁସାରେ"</string>
-    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"ଶତକଡା ଅନୁପାତ ଆଧାରରେ"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"ଆପଣଙ୍କ ପରବର୍ତ୍ତୀ ବିଶେଷ ରିଚାର୍ଜ ପୂର୍ବରୁ, ଯଦି ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ସରିବାକୁ ଯାଉଥାଏ, ତେବେ ବ୍ୟାଟେରୀ ସେଭର୍‌ ଚାଲୁ ହୋ‍ଇଯାଏ"</string>
+    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"ଶତକଡ଼ା ଆଧାରରେ"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"ଆପଣଙ୍କ ପରବର୍ତ୍ତୀ ଚାର୍ଜ ପୂର୍ବରୁ, ଯଦି ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ସରିବାକୁ ଯାଉଥାଏ, ତେବେ ବ୍ୟାଟେରୀ ସେଭର୍‌ ଚାଲୁ ହୋ‍ଇଯାଏ"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"<xliff:g id="PERCENT">%1$s</xliff:g>ରେ ଚାଲୁ ହେବ"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"ଗୋଟିଏ ସୂଚୀ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="battery_saver_turn_on_summary" msgid="5552800757174173459">"ବ୍ୟାଟେରୀର ଜୀବନକାଳ ବଢ଼ାନ୍ତୁ"</string>
     <string name="battery_saver_sticky_title_new" msgid="613272902035943099">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବାପରେ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"ଆପଣଙ୍କ ଫୋନ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ଚାଲୁ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6537930800784858686">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ଚାଲୁ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8309483774864505603">"ଆପଣଙ୍କ ଡିଭାଇସ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ଚାଲୁ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"ଆପଣଙ୍କ ଫୋନ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6537930800784858686">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8309483774864505603">"ଆପଣଙ୍କ ଡିଭାଇସ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3795833548145424276) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="1138980155985636295">"ଅନ୍ କରନ୍ତୁ"</string>
@@ -2501,7 +2528,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 ଘଣ୍ଟା"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ଘଣ୍ଟା"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ଦିନ"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"ସିଷ୍ଟମ୍‌ ଦେଖାଅ"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"ସିଷ୍ଟମ୍‌ ଦେଖାନ୍ତୁ"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"ସିଷ୍ଟମ୍‌କୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"ଶତକଡ଼ା ଦେଖାନ୍ତୁ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -2537,7 +2564,7 @@
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD କାର୍ଡରୁ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ଷ୍ଟୋରେଜ୍‌ରୁ ସର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD କାର୍ଡରୁ ସର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"କ୍ରେଡେନଶିଆଲ୍ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"କ୍ରେଡେନସିଆଲ୍ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ସବୁ ସର୍ଟିଫିକେଟ୍‌କୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ବିଶ୍ୱସନୀୟ କ୍ରେଡେନସିଆଲ୍‌"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ବିଶ୍ୱସନୀୟ CA ସର୍ଟିଫିକେଟ୍‌ ଦେଖାନ୍ତୁ"</string>
@@ -2729,7 +2756,7 @@
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ଡାଟା ବ୍ୟବହାରର ସୀମା ଧାର୍ଯ୍ୟ କରନ୍ତୁ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ଡାଟାର ବ୍ୟବହାର ସୀମିତ କରିବା"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ସେଟ୍‌ କରାଯାଇଥିବା ସୀମାରେ ପହଞ୍ଚିବା ପରେ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌, ମୋବାଇଲ୍‌ ଡାଟାକୁ ବନ୍ଦ‌ କରିଦେବ।\n\nଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ ଓ ମୋବାଇଲ୍‌ ନେଟ୍‍ୱର୍କ ବାହକଙ୍କର ଡାଟା ବ୍ୟବହାର ଗଣନା ଭିନ୍ନ ହୋଇଥିବାରୁ, ଏକ ସଂକୁଚିତ ସୀମା ନିର୍ଦ୍ଧାରଣ କରନ୍ତୁ।"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ଡାଟାର ବ୍ୟବହାର ଆପଣ ସେଟ୍‌ କରିଥିବା ସୀମାରେ ପହଞ୍ଚିଗଲେ, ଆପଣଙ୍କ ଫୋନ୍‌ ମୋବାଇଲ୍‌ ଡାଟାକୁ ବନ୍ଦ କରିଦେବ।\n\nଯେହେତୁ ଆପଣଙ୍କ ଫୋନ୍‌ ଡାଟା ବ୍ୟବହାରର ହିସାବ ରଖିଥାଏ ଏବଂ ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ସେବା ପ୍ରଦାତାଙ୍କ ଦ୍ୱାରା ରଖାଯାଇଥିବା ହିସାବ ସାମାନ୍ୟ ଭିନ୍ନ ହୋଇପାରେ, ତେଣୁ ମୋବାଇଲ୍‌ ଡାଟାର ବ୍ୟବହାର କମ୍ ହେବ, ଏହିପରି ଏକ ସୀମା ସେଟ୍‌ କରନ୍ତୁ।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ଡାଟାର ବ୍ୟବହାର ଆପଣ ସେଟ୍‌ କରିଥିବା ସୀମାରେ ପହଞ୍ଚିଗଲେ, ଆପଣଙ୍କ ଫୋନ୍‌ ମୋବାଇଲ୍‌ ଡାଟାକୁ ବନ୍ଦ କରିଦେବ।\n\nଯେହେତୁ ଆପଣଙ୍କ ଫୋନ୍‌ ଡାଟା ବ୍ୟବହାରର ହିସାବ ରଖିଥାଏ ଏବଂ ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ସେବା ପ୍ରଦାତାଙ୍କ ହିସାବ ଭିନ୍ନ ହୋଇପାରେ, ତେଣୁ ମୋବାଇଲ୍‌ ଡାଟା ଯେମିତି ନିୟନ୍ତ୍ରିତ ଭାବେ ବ୍ୟବହାର କରିବେ, ସେମିତି ଏକ ସୀମା ସେଟ୍‌ କରନ୍ତୁ।"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟାକୁ ସୀମିତ କରିବେ?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"ଯଦି ଆପଣ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ମୋବାଇଲ୍‌ ଡାଟାକୁ ରୋକନ୍ତି, ତେବେ ୱାଇ-ଫାଇ ସହିତ ସଂଯୁକ୍ତ ନହେବା ପର୍ଯ୍ୟନ୍ତ କେତେକ ଆପ୍‍ ଓ ସେବା କାମ କରିବ ନାହିଁ।"</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"ଯଦି ଆପଣ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ମୋବାଇଲ୍‌ ଡାଟାକୁ ରୋକନ୍ତି, ତେବେ ୱାଇ-ଫାଇ ସହିତ ସଂଯୁକ୍ତ ନହେବା ପର୍ଯ୍ୟନ୍ତ କେତେକ ଆପ୍‍ ଓ ସେବା କାମ କରିବ ନାହିଁ।\n\nଏହି ସେଟିଙ୍ଗ, ଟାବଲେଟ୍‌ରେ ଥିବା ସମସ୍ତ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ପ୍ରଭାବିତ କରିବ।"</string>
@@ -2749,7 +2776,7 @@
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ମିଟରଯୁକ୍ତ ନେଟ୍‌ୱର୍କଗୁଡିକର ଚୟନ କରିବାକୁ, ୱାଇ-ଫାଇ ଅନ୍‌ କରନ୍ତୁ।"</string>
     <string name="data_usage_metered_auto" msgid="1262028400911918865">"ସ୍ଵତଃଚାଳିତ"</string>
     <string name="wifi_metered_title" msgid="5536703738895222444">"ନେଟ୍‍ୱାର୍କର ବ୍ୟବହାର"</string>
-    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ମପାଯାଉଥିବା"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ମିଟର୍ଡ"</string>
     <string name="data_usage_metered_no" msgid="4025232961929071789">"ମପାଯାଉନାହିଁ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ କ୍ୟାରିଅରଙ୍କ ଡାଟା ଗଣନା ଭିନ୍ନ ହୋଇପାରେ।"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ଜରୁରୀକାଳୀନ କଲ୍‌"</string>
@@ -2816,7 +2843,7 @@
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ଉଭୟ ସର୍ଭର୍‌ ଓ DNS ପାଇଁ ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ଗୋଟିଏ IP ଠିକଣା ଆବଶ୍ୟକ କରେ।"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"କୌଣସି ନେଟ୍‌ୱର୍କ ସଂଯଗ ନାହିଁ। କିଛି ସମୟ ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN ରୁ ବିଚ୍ଛିନ୍ନ ହେଲା"</string>
-    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"କିଛି ନୁହେଁ"</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"କିଛି ନାହିଁ"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"ଗୋଟିଏ ସର୍ଟିଫିକେଟ୍‌ ନାହିଁ। ପ୍ରୋଫାଇଲ୍‌ ଏଡିଟ୍‌ କରନ୍ତୁ।"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ସିଷ୍ଟମ୍‌"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ଉପଯୋଗକର୍ତ୍ତା"</string>
@@ -3017,7 +3044,7 @@
     <string name="sim_select_card" msgid="211285163525563293">"ଏକ SIM କାର୍ଡ ବାଛି ନିଅନ୍ତୁ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ଖାଲି ଅଛି"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"ସିମ୍‌ର ନାମ"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"SIM ନାମ"</string>
     <string name="sim_name_hint" msgid="7038643345238968930">"SIM ନାମ ପ୍ରବେଶ କରନ୍ତୁ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM ସ୍ଲଟ୍‌ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ମୋବାଇଲ୍‍ କମ୍ପାନୀ"</string>
@@ -3526,7 +3553,7 @@
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"ମେସେଜ୍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_messages_footer" msgid="2616568463646674149">"ଅନୁମତି ଦିଆଯାଇଥିବା ମେସେଜ୍ ଆସିବା ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ସାଉଣ୍ଡ ହେବ, ଏହା ନିଶ୍ଚିତ କରିବା ପାଇଁ, ଏହା ରିଙ୍ଗ, ଭାଇବ୍ରେଟ୍, ବା ନୀରବରେ ସେଟ୍ କରିଯାଇଛି କି ନାହିଁ ତାହା ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
-    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡିକ ଅବରୋଧ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
+    <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS ଏବଂ ମେସେଜିଂ ଆପ୍ସ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ଯେକୌଣସି ବ୍ୟକ୍ତିଙ୍କଠାରୁ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"କେବଳ ଯୋଗାଯୋଗଙ୍କ ମଧ୍ୟରୁ"</string>
@@ -3764,7 +3791,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"ଆପଣଙ୍କ ଆଡମିନ୍‌ଙ୍କ ସହିତ ଏହି ତ୍ରୁଟି ରିପୋର୍ଟ ସେୟାର୍‌ କରାଯାଇଛି। ଅଧିକ ବିବରଣୀ ପାଇଁ ତାଙ୍କ ସହିତ ସମ୍ପର୍କ କରନ୍ତୁ।"</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"ସେୟାର୍‌ କରନ୍ତୁ"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
-    <string name="usb_use_charging_only" msgid="4800495064747543954">"ଡାଟା ଟ୍ରାନ୍ସଫର୍‌ ହେବ ନାହିଁ"</string>
+    <string name="usb_use_charging_only" msgid="4800495064747543954">"ଡାଟା ସ୍ଥାନାନ୍ତର ହେବ ନାହିଁ"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ଏହି ଡିଭାଇସ୍‌କୁ ଚାର୍ଜ କରିଦିଅନ୍ତୁ"</string>
     <string name="usb_use_power_only" msgid="3236391691786786070">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‍ ଚାର୍ଜ କରନ୍ତୁ"</string>
     <string name="usb_use_file_transfers" msgid="1223134119354320726">"ଫାଇଲ୍‌ ଟ୍ରାନ୍ସଫର୍‌"</string>
@@ -3778,7 +3805,7 @@
     <string name="usb_default_label" msgid="2211094045594574774">"ଡିଫଲ୍ଟ USB କନଫିଗରେସନ୍"</string>
     <string name="usb_default_info" msgid="8864535445796200695">"ଯେତେବେଳେ ଅନ୍ୟ ଡିଭାଇସ୍ କନେକ୍ଟ ହୋଇଥାଏ ଏବଂ ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ ଥାଏ, ଏହି ସେଟିଙ୍ଗଗୁଡ଼ିକ ଲାଗୁ ହେବ। କେବଳ ବିଶ୍ୱସନୀୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_preference" msgid="7394265019817945275">"USB ପ୍ରାଥମିକତା"</string>
+    <string name="usb_preference" msgid="7394265019817945275">"USB ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="usb_control_title" msgid="4404322722995917160">"USB ଏହା ଦ୍ୱାରା ନିୟନ୍ତ୍ରିତ"</string>
     <string name="usb_control_host" msgid="2276710819046647200">"ସଂଯୁକ୍ତ ଡିଭାଇସ୍"</string>
     <string name="usb_control_device" msgid="5821511964163469463">"ଏହି ଡିଭାଇସ୍‍"</string>
@@ -3995,12 +4022,12 @@
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ଡାଟା ସମ୍ପର୍କିତ ସୂଚନା ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="data_warning" msgid="209133958008062117">"ଡାଟା ଚେତାବନୀ"</string>
-    <string name="data_warning_footnote" msgid="776341964125603711">"ଡାଟା ସମ୍ପର୍କିତ ଚେତାବନୀ ଓ ଡାଟା ସୀମା ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ଦ୍ୱାରା ମପାଯାଏ। ଏହାର ମାନ, କେରିଅର୍‌ ଦ୍ଵାରା ମପାଯାଇଥିବା ମାନଠାରୁ ଭିନ୍ନ ହୋଇପାରେ।"</string>
+    <string name="data_warning_footnote" msgid="776341964125603711">"ଡାଟା ସମ୍ପର୍କିତ ଚେତାବନୀ ଓ ଡାଟା ସୀମା ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ଦ୍ୱାରା ମପାଯାଏ। ଏହା କେରିଅର୍‌ ଡାଟାରୁ ଭିନ୍ନ ହୋଇପାରେ।"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ଡାଟା ସୀମା ସେଟ କରନ୍ତୁ"</string>
     <string name="data_limit" msgid="1885406964934590552">"ଡାଟା ସୀମା"</string>
     <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ବ୍ୟବହୃତ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"କନଫିଗ୍ୟୁର କରନ୍ତୁ"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"ବ୍ୟବହାରରେ ଜଡ଼ିତ ଥିବା ଅନ୍ୟାନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ବ୍ୟବହାରରେ ଅନ୍ତର୍ଭୁକ୍ତ ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">ଡାଟା ସେଭର୍‌ ଅନ୍‌ ଥିବାବେଳେ <xliff:g id="COUNT">%1$d</xliff:g>ଟି ଆପ୍‌ ଅପ୍ରତିବନ୍ଧିତ ଡାଟା ବ୍ୟବହାର କରିପାରିବ</item>
       <item quantity="one">ଡାଟା ସେଭର୍‌ ଅନ୍‌ ଥିବାବେଳେ 1ଟି ଆପ୍‌ ଅପ୍ରତିବନ୍ଧିତ ଡାଟା ବ୍ୟବହାର କରିପାରିବ</item>
@@ -4312,8 +4339,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ଫୋକସ୍ ରହିବା ପାଇଁ ବିଜ୍ଞପ୍ତି ବିରତି କରନ୍ତୁ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ଏହି ଡିଭାଇସ୍‌ରେ ଏହି ବୈଶିଷ୍ଟ୍ୟ ଉପଲବ୍ଧ ନୁହେଁ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ଏହି ବୈଶିଷ୍ଟ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ଏହା ଏହି ଫୋନ୍‍କୁ ମନ୍ଥର କରିଦେବ"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ପୂର୍ଣ୍ଣ GNSS ପରିମାପ ବାଧ୍ୟ କରନ୍ତୁ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ଉପଯୋଗିତା ଅନୁପାତ ନଥିବା ସମସ୍ତ GNSS ଉପଗ୍ରହ ସମଷ୍ଟି ଓ ଫ୍ରିକ୍ୱେନ୍ସୀକୁ ଟ୍ରାକ୍‌ କରନ୍ତୁ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"ପୃଷ୍ଠଭୂମି କାର୍ଯ୍ୟକଳାପ ଆରମ୍ଭ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -4444,7 +4473,7 @@
     <string name="mobile_network_inactive_sim" msgid="291768076436646044">"ନିଷ୍କ୍ରିୟ / SIM"</string>
     <string name="mobile_network_active_esim" msgid="4914509039134228659">"ସକ୍ରିୟ / ଡାଉନଲୋଡ୍ କରଯାଇଥିବା SIM"</string>
     <string name="mobile_network_inactive_esim" msgid="7653631389686307842">"ନିଷ୍କ୍ରିୟ / ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIM"</string>
-    <string name="mobile_network_sim_name" msgid="5081645961314356327">"ସିମ୍ ନାମ"</string>
+    <string name="mobile_network_sim_name" msgid="5081645961314356327">"SIM ନାମ"</string>
     <string name="mobile_network_sim_name_rename" msgid="7626733408098403107">"ରିନେମ୍ କରନ୍ତୁ"</string>
     <string name="mobile_network_use_sim_on" msgid="8035448244261570189">"SIM ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="mobile_network_use_sim_off" msgid="889073420068380943">"ବନ୍ଦ ଅଛି"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 5bd180d..a02f4c8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ਚਿਹਰਾ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ਪਹੁੰਚਯੋਗਤਾ ਦਾ ਸੈੱਟਅੱਪ ਵਰਤੋ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ਚੱਕਰ ਦੇ ਅੰਦਰ ਆਪਣਾ ਚਿਹਰਾ ਕੇਂਦਰਿਤ ਕਰੋ"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਚਿਹਰੇ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
@@ -792,7 +799,7 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"ਇਸ ਲਈ ਵਰਤੋ"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"ਨਾਮ ਬਦਲੋ"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ਇਨਕਮਿੰਗ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="6436258151814414028">"ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਲਈ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"ਡੀਵਾਈਸ ਨਾਲ ਸਥਾਨਕ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -1416,7 +1423,7 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਹੋ ਰਹੀ ਹੈ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਾਂ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"ਨਾਮ ਬਦਲੋ"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"ਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"ਬਾਹਰ ਕੱਢੋ"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ਫੌਰਮੈਟ"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ਹਰਾ ਨੀਲਾ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"ਪੀਲਾ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ਮਜੈਂਟਾ"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣੀ ਹੈ?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਇਜਾਜ਼ਤ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਾਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ।"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ਇਸ ਡੀਵਾਈਸ ਦੇ ਪੂਰੇ ਕੰਟਰੋਲ ਲਈ ਬੇਨਤੀ ਕਰ ਰਹੀ ਹੈ। ਸੇਵਾ ਸਕ੍ਰੀਨ ਨੂੰ ਪੜ੍ਹ ਕੇ ਪਹੁੰਚਯੋਗਤਾ ਜ਼ਰੂਰਤਾਂ ਵਾਲੇ ਵਰਤੋਂਕਾਰਾਂ ਵਜੋਂ ਕੰਮ ਕਰ ਸਕਦੀ ਹੈ। ਜ਼ਿਆਦਾਤਰ ਐਪਾਂ ਲਈ ਕੰਟਰੋਲ ਦਾ ਇਹ ਪੱਧਰ ਢੁਕਵਾਂ ਨਹੀਂ ਹੈ।"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"\'ਠੀਕ ਹੈ\' \'ਤੇ ਟੈਪ ਕਰਨ ਨਾਲ <xliff:g id="SERVICE">%1$s</xliff:g> ਬੰਦ ਹੋ ਜਾਵੇਗੀ।"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ਕੋਈ ਸੇਵਾਵਾਂ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ਕਿਸੇ ਸੇਵਾ ਨੂੰ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ਕੋਈ ਵਰਣਨ ਮੁਹੱਈਆ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"</string>
@@ -2982,7 +3009,7 @@
     <string name="mms_message_summary" msgid="8408985719331988420">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਹੋਣ \'ਤੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"ਦਫ਼ਤਰ SIM"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"ਐਪ &amp; ਸਮੱਗਰੀ ਪਹੁੰਚ"</string>
-    <string name="user_rename" msgid="8523499513614655279">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ਨਾਮ ਬਦਲੋ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ਐਪ ਪ੍ਰਤਿਬੰਧ ਸੈੱਟ ਕਰੋ"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> ਵੱਲੋਂ ਨਿਯੰਤਰਿਤ"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖਣ ਲਈ ਸੂਚਨਾਵਾਂ ਰੋਕੋ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ਇਸ ਨਾਲ ਇਸ ਫ਼ੋਨ ਦੀ ਗਤੀ ਧੀਮੀ ਹੋਵੇਗੀ"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS ਮਾਪ ਨੂੰ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਦਿਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 25b5a38..0ba8590 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
     <string name="create" msgid="3578857613172647409">"Utwórz"</string>
     <string name="allow" msgid="3349662621170855910">"Zezwól"</string>
     <string name="deny" msgid="6947806159746484865">"Odmów"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string>
+    <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Od zostania programistą dzielą Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroki.</item>
       <item quantity="many">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroków.</item>
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Dodano twarz"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Kliknij, by ustawić uwierzytelnianie twarzą"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Uwierzytelnianie twarzą"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Użyj konfiguracji ułatwień dostępu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Używaj skanu twarzy do odblokowywania telefonu, autoryzowania zakupów i logowania się w aplikacjach."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odblokowuj telefon i zatwierdzaj zakupy skanem twarzy.\n\nUwaga: nie możesz odblokowywać tego urządzenia skanem twarzy. Więcej informacji uzyskasz od administratora swojej organizacji."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Używaj skanu twarzy do odblokowywania telefonu, autoryzowania zakupów i logowania się w aplikacjach"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Ustaw twarz w środku okręgu"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Później"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> skanów twarzy"</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyjan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Żółty"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Amarantowy"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Włączyć <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Wymagania <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacja Ustawienia nie może zweryfikować Twojej odpowiedzi, ponieważ inna aplikacja zasłania prośbę o udzielenie uprawnień."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jeśli włączysz usługę <xliff:g id="SERVICE">%1$s</xliff:g>, Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swoje hasło."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Usługa <xliff:g id="SERVICE">%1$s</xliff:g> prosi o pełną kontrolę nad urządzeniem. Ta usługa może odczytywać zawartość ekranu i wykonywać działania w imieniu użytkownika, który potrzebuje ułatwień dostępu. Taki poziom kontroli nie jest odpowiedni w przypadku większości aplikacji."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Brak zainstalowanych usług"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nie wybrano usługi"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
@@ -3306,7 +3333,7 @@
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Nie zobaczysz powiadomień na ekranie"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon nie będzie sygnalizował powiadomień dźwiękiem ani wibracjami."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Brak wizualnego i dźwiękowego sygnalizowania powiadomień"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem."</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Telefon nie będzie sygnalizował nowych ani obecnych powiadomień poprzez wyświetlenie informacji, wibrację ani dzwonek. Pamiętaj, że krytyczne powiadomienia dotyczące aktywności i stanu telefonu nadal będą się pojawiać.\n\nPo wyłączeniu trybu Nie przeszkadzać możesz zobaczyć wszystkie powiadomienia, przesuwając palcem w dół z góry ekranu."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Niestandardowe"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Włącz ustawienia niestandardowe"</string>
@@ -3590,12 +3617,12 @@
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"Tych ustawień nie można teraz zmienić. Aplikacja (<xliff:g id="APP_NAME">%1$s</xliff:g>) automatycznie włączyła niestandardowe ustawienia trybu Nie przeszkadzać."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Tych ustawień nie można teraz zmienić. Aplikacja automatycznie włączyła niestandardowe ustawienia trybu Nie przeszkadzać."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Tych ustawień nie można teraz zmienić. Ręcznie włączono niestandardowe ustawienia trybu Nie przeszkadzać."</string>
-    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Czas"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Godzina"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatyczna reguła będzie włączać funkcję „Nie przeszkadzać” w określonych dniach i godzinach"</string>
     <string name="zen_event_rule_type_name" msgid="6503468472212606158">"Wydarzenie"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatyczna reguła będzie włączać funkcję „Nie przeszkadzać” podczas określonych wydarzeń"</string>
-    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Podczas wydarzeń dla"</string>
-    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Podczas wydarzeń dla <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Podczas wydarzeń z kalendarza"</string>
+    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Podczas wydarzeń z kalendarza <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"dowolnego kalendarza"</string>
     <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Gdy odpowiedź to <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Dowolny kalendarz"</string>
@@ -3611,17 +3638,17 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Codziennie"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Alarm może zastąpić godzinę zakończenia"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="1673667979187593693">"Harmonogram wyłączy się w przypadku dzwonka alarmu"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Działanie w trybie Nie przeszkadzać"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Działanie Nie przeszkadzać"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"Użyj ustawień domyślnych"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"Wybierz ustawienia niestandardowe dla tego harmonogramu"</string>
-    <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"Dotyczy: <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>"</string>
+    <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od: <xliff:g id="START">%1$s</xliff:g> do: <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="4769117032399813012">"Zezwól na połączenia"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"Połączenia"</string>
     <string name="zen_mode_calls_footer" msgid="2002070641802102110">"Aby mieć pewność, że dopuszczone połączenia będą sygnalizowane dźwiękowo, sprawdź, czy urządzenie ma włączony dzwonek, a nie jest ustawione na wibracje ani wyciszone."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"W harmonogramie <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły do Ciebie pisać."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły do Ciebie pisać."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakty oznaczone gwiazdką"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> inne osoby</item>
@@ -3662,7 +3689,7 @@
     <string name="zen_mode_events_list" msgid="5571368229052715098">"wydarzenia"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"każdy"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakty"</string>
-    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakty oznaczone gwiazdką"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakty z gwiazdką"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Dzwoniący powtórnie"</string>
     <string name="zen_mode_repeat_callers_list" msgid="2529895519653237330">"dzwoniący powtórnie"</string>
     <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Zezwól na połączenia od dzwoniących powtórnie"</string>
@@ -4304,7 +4331,7 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Aby przełączać aplikacje, przesuń palcem w górę po przycisku ekranu głównego. Przesuń ponownie w górę, by zobaczyć wszystkie aplikacje. Funkcja działa na każdym ekranie. Nie będziesz już mieć przycisku Przegląd w prawym dolnym rogu ekranu."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Wypróbuj nowy przycisk ekranu głównego"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Włącz nowy gest, by przełączać aplikacje"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknij dwukrotnie, aby sprawdzić telefon"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknij dwukrotnie, by sprawdzić telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknij dwukrotnie, by sprawdzić tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknij dwukrotnie, by sprawdzić urządzenie"</string>
     <string name="ambient_display_summary" msgid="8534654210539169707">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran dwukrotnie."</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Zmień ustawienia trybu Nie przeszkadzać"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Wstrzymaj powiadomienia, by Cię nie rozpraszały"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcja jest niedostępna na tym urządzeniu."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ta funkcja jest niedostępna"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Spowoduje spowolnienie telefonu"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Wymuś pełną procedurę pomiarów GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Śledź wszystkie konstelacje GNSS i częstotliwości bez uwzględniania współczynnika impulsu"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Zezwól na uruchomienie aktywności w tle"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 32699ed..1a1958f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toque para config. a autenticação facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticação facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use seu rosto para desbloquear o smartphone ou aprovar compras.\n\nObservação: não é possível usar seu rosto para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centralize seu rosto dentro do círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mais tarde"</string>
     <string name="face_add_max" msgid="4408683751143942949">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Ciano"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme sua senha."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando controle total deste dispositivo. O serviço pode ler a tela e realizar ações em nome de usuários com necessidades especiais. Esse nível de controle não é adequado para a maioria dos apps."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Desativar o recurso <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Toque em \"Ok\" para desativar o recurso <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nenhum serviço selecionado"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esse recurso não está disponível"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Isso deixará seu smartphone mais lento"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir início de atividades em segundo plano"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c28dfa1..f887b62 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado."</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toque para configurar a autenticação facial."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticação facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Utiliz. config. acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilize o seu rosto para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilize o seu rosto para desbloquear o telemóvel ou autorizar compras.\n\nNota: não pode utilizar o seu rosto para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilize o seu rosto para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrar o rosto no círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fazer isto mais tarde"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos."</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Azul-turquesa"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Uma vez que uma aplicação está a ocultar um pedido de autorização, as Definições não conseguem validar a sua resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se ativar o <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar a sua palavra-passe."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"O serviço <xliff:g id="SERVICE">%1$s</xliff:g> está a solicitar o controlo total deste dispositivo. O serviço pode ler o ecrã e agir em nome de utilizadores com necessidades de acessibilidade. Este nível de controlo não é adequado para a maioria das aplicações."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Toque em OK para parar <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço instalado"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nenhum serviço selecionado"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não incomodar"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Coloque as notificações em pausa para se manter concentrado."</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esta funcionalidade não está disponível."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Vai tornar este telemóvel mais lento."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições de GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir inícios da atividade em segundo plano"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b8494cb..1a1958f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Toque para config. a autenticação facial"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autenticação facial"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use seu rosto para desbloquear o smartphone ou aprovar compras.\n\nObservação: não é possível usar seu rosto para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centralize seu rosto dentro do círculo"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mais tarde"</string>
     <string name="face_add_max" msgid="4408683751143942949">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos"</string>
@@ -430,8 +437,8 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="3555852478589689141">"Botão de confirmação"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="7965662696468917986">"Sempre exigir confirmação durante a autenticação de apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"Excluir info facial"</string>
-    <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"Configurar novo \"Desbloqueio facial\""</string>
-    <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"Use o \"Desbloqueio facial\" para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se ele for direcionado para seu rosto enquanto seus olhos estiverem abertos.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, seu filho ou um gêmeo idêntico."</string>
+    <string name="security_settings_face_settings_enroll" msgid="664990192460698660">"Configurar novo desbloqueio facial"</string>
+    <string name="security_settings_face_settings_footer" msgid="7769500154351757004">"Use o Desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se ele for direcionado para seu rosto enquanto seus olhos estiverem abertos.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, seu filho ou um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Excluir dados faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="2609671025686003946">"Os dados gravados pelo \"Desbloqueio facial\" serão excluídos permanentemente e com segurança. Depois da remoção, você precisará do PIN, padrão ou senha para desbloquear o smartphone, fazer login em apps e confirmar pagamentos."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
@@ -759,7 +766,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Compartilhar agenda telefônica?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quer acessar seus contatos e o histórico de chamadas."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quer parear com Bluetooth. Quando conectado, terá acesso a seus contatos e histórico de chamadas."</string>
-    <string name="bluetooth_preference_found_media_devices" msgid="1617401232446299411">"Dispositivos disponíveis"</string>
+    <string name="bluetooth_preference_found_media_devices" msgid="1617401232446299411">"Dispositivos encontrados"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Nenhum dispositivo disponível"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
@@ -867,7 +874,7 @@
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para usar, selecione um provedor de avaliação de rede compatível"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5544778734762998889">"Para melhorar precisão de local, os apps e serviços ainda podem procurar redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi está desativado. Essa configuração pode ser usada, por exemplo, para melhorar os recursos e serviços baseados na localização. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para melhorar a precisão de local, ative a verificação Wi-Fi nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para melhorar a precisão de local, ative a busca por Wi-Fi nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Não mostrar novamente"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante suspensão"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativo durante suspensão"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Ciano"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme sua senha."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando controle total deste dispositivo. O serviço pode ler a tela e realizar ações em nome de usuários com necessidades especiais. Esse nível de controle não é adequado para a maioria dos apps."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Desativar o recurso <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Toque em \"Ok\" para desativar o recurso <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nenhum serviço selecionado"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
@@ -2541,7 +2568,7 @@
     <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar os certificados e as autoridades de confiança"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Avançado"</string>
@@ -3340,14 +3367,14 @@
     <string name="swipe_direction_ltr" msgid="3623394320915041215">"Deslize para a direita para dispensar e para esquerda para mostrar o menu"</string>
     <string name="swipe_direction_rtl" msgid="4972099509548044938">"Deslize para esquerda para dispensar ou para direita para mostrar o menu"</string>
     <string name="gentle_notifications_title" msgid="3976374971153475110">"Notificações discretas"</string>
-    <string name="gentle_notifications_also_display" msgid="6455360420411828133">"Também são exibidas em"</string>
+    <string name="gentle_notifications_also_display" msgid="6455360420411828133">"Também exibir em"</string>
     <string name="gentle_notifications_display_status" msgid="2904115658980383410">"Barra de status"</string>
     <string name="gentle_notifications_display_lock" msgid="1395567209329239992">"Tela de bloqueio"</string>
     <string name="gentle_notifications_education" msgid="8713358646047345762">"As notificações discretas são sempre exibidas na aba suspensa e sem som"</string>
-    <string name="gentle_notifications_display_summary_shade" msgid="6583107817329430916">"Exibidas apenas na aba suspensa"</string>
-    <string name="gentle_notifications_display_summary_shade_lock" msgid="1434426811760016414">"Exibidas na aba suspensa e na tela de bloqueio"</string>
-    <string name="gentle_notifications_display_summary_shade_status" msgid="6113566548809874319">"Exibidas na aba suspensa e na barra de status"</string>
-    <string name="gentle_notifications_display_summary_shade_status_lock" msgid="4222628772925544654">"Exibidas na aba suspensa, barra de status e tela de bloqueio"</string>
+    <string name="gentle_notifications_display_summary_shade" msgid="6583107817329430916">"Exibir apenas na aba suspensa"</string>
+    <string name="gentle_notifications_display_summary_shade_lock" msgid="1434426811760016414">"Exibir na aba suspensa e na tela de bloqueio"</string>
+    <string name="gentle_notifications_display_summary_shade_status" msgid="6113566548809874319">"Exibir na aba suspensa e na barra de status"</string>
+    <string name="gentle_notifications_display_summary_shade_status_lock" msgid="4222628772925544654">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="7604704224172951090">"Tela de bloqueio"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Quando o perfil de trabalho está bloqueado"</string>
@@ -3593,7 +3620,7 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação de tela"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Fixar tela"</string>
     <string name="screen_pinning_description" msgid="1110847562111827766">"Com esta configuração ativada, o recurso Fixar tela mantém a tela atual em exibição até que você a libere.\n\nPara usar o recurso Fixar tela:\n\n1. Verifique se o recurso está ativado.\n\n2. Abra a Visão geral.\n\n3. Toque no ícone do app na parte superior da tela e depois em Fixar."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pedir padrão de desbloqueio antes de desafixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
@@ -3616,7 +3643,7 @@
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="restricted_true_label" msgid="4761453839409220473">"Restrito"</string>
-    <string name="restricted_false_label" msgid="3279282180297058755">"O app pode usar a bateria em seg. plano"</string>
+    <string name="restricted_false_label" msgid="3279282180297058755">"O app pode usar a bateria em 2º plano"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exigir padrão?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exigir senha?"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Esse recurso não está disponível"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Isso deixará seu smartphone mais lento"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permitir início de atividades em segundo plano"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2ad92df..b19d7b0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Chip adăugat"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Atingeți pt. a config. autentif. facială"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Autentificare facială"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Folosiți configurarea accesibilității"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Folosiți-vă chipul ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Folosiți fața ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi fața ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Folosiți-vă chipul ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrați-vă fața în cerc"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mai târziu"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Puteți să adăugați până la <xliff:g id="COUNT">%d</xliff:g> fețe"</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Galben"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> are funcțiile:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Deoarece o aplicație acoperă o solicitare de permisiune, Setările nu vă pot verifica răspunsul."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Dacă activați <xliff:g id="SERVICE">%1$s</xliff:g>, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați codul PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați parola."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> solicită control total asupra acestui dispozitiv. Serviciul poate citi ecranul și poate acționa în numele utilizatorilor cu nevoi de accesibilitate. Acest nivel de control nu este adecvat pentru majoritatea aplicațiilor."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Opriți <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Atingând OK veți opri <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nu există servicii instalate"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Niciun serviciu selectat"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizați funcția Nu deranja"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Întrerupeți notificările pentru a vă păstra concentrarea"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Această funcție nu este disponibilă"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Va încetini acest dispozitiv"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forțați măsurători GNSS complete"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Permiteți ca activitățile să pornească în fundal"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 576478b..250685f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Сканирование завершено"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Нажмите, чтобы настроить распознавание лица"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Распознавание лица"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Использовать специальные возможности"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Используйте распознавание лица для разблокировки телефона, подтверждения покупок и входа в приложения."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Разблокируйте телефон и подтверждайте покупки с помощью распознавания лица.\n\nВнимание! Для разблокировки этого устройства распознавание лица использовать нельзя. За подробной информацией обратитесь к администратору."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Используйте распознавание лица для разблокировки телефона, подтверждения покупок и входа в приложения."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Поместите лицо в центр круга"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Не сейчас"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Максимальное количество лиц, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Голубой"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Желтый"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурный"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Невозможно принять ваше согласие, поскольку запрос скрыт другим приложением."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Если включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\", блокировка экрана будет отключена и надежность защиты зашифрованных данных снизится."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести PIN-код."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести пароль."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> запрашивает полный доступ к устройству. Сервис может считывать данные с экрана и действовать от имени пользователей, которым требуются специальные возможности. Этот уровень доступа не подходит для большинства приложений."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Остановить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Чтобы отключить \"<xliff:g id="SERVICE">%1$s</xliff:g>\", нажмите \"ОК\"."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Службы не установлены"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Сервис не выбран"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Включите режим \"Не беспокоить\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Заблокируйте отвлекающие уведомления"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функция недоступна на этом устройстве."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Эта функция недоступна."</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Она замедляет работу телефона."</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Полные измерения GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Отслеживать все группировки GNSS и частоты без рабочего цикла"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Разрешить запуск компонентов в фоновом режиме"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 4d93c78..bbc9d91 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"මුහුණ එකතු කරන ලදි"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"මුහුණු සත්‍යාපනය පිහිටුවීම සඳහා තට්ටු ක."</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"මුහුණු සත්‍යාපනය"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ප්‍රවේශ්‍යතා පිහිටුවීම භාවිතය"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ යෙදුම්වලට පිරීමට ඔබේ මුහුණ භාවිත කරන්න."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ මුහුණ භාවිත කරන්න.\n\nසටහන: ඔබට ඔබේ මුහුණ මෙම උපාංගය අගුලු හැරීමට භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ යෙදුම්වලට පිරීමට ඔබේ මුහුණ භාවිත කරන්න."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"රවුමේ ඔබේ මුහුණ කේන්ද්‍රගත කරන්න"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"පසුව එය කරන්න"</string>
     <string name="face_add_max" msgid="4408683751143942949">"ඔබට මුහුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එක් කළ හැකිය"</string>
@@ -1578,7 +1585,7 @@
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"යළි සැකසීමේ විකල්ප"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"ජාල, යෙදුම්, හෝ උපාංගය යළි සැකසිය හැකිය"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සක."</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සකසන්න"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"මෙය, පහත ඒවා ඇතුළුව සියලු ජාල සැකසීම් යළි සකසනු ඇත:\n\n"<li>"Wi‑Fi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
     <string name="reset_esim_title" msgid="1979762943163078939">"බාගත් SIM පත් මකන්න"</string>
     <string name="reset_esim_desc" msgid="5940105242448544634">"ප්‍රතිස්ථාපන SIM පත් බාගැනීමට, ඔබේ වාහකයා සම්බන්ධ කර ගන්න. මෙය ජංගම සේවා සැලසුම් කිසිවක් අවලංගු නොකරයි."</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"මයුර නිල්"</string>
     <string name="color_yellow" msgid="9112680561610873529">"කහ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"දම්පාට තද රතු"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> හට අවශ්‍යයි:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"යෙදුම අවසර ඉල්ලීමක් කරන නිසා, සැකසීම් හට ඔබගේ ප්‍රතිචාරය සත්‍යාපනය කළ නොහැක."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ඔබ <xliff:g id="SERVICE">%1$s</xliff:g> සක්‍රිය කළේ නම්, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ PIN එක ඔබට සහතික කිරීමට අවශ්‍යය."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ මුරපදය ඔබට සහතික කිරීමට අවශ්‍යය."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> මෙම උපාංගයේ සම්පූර්ණ පාලනය ඉල්ලමින්. සේවාවට තිරය කියවීමට සහ ප්‍රවේශ්‍යතා අවශ්‍යතා ඇති පරිශීලකයන් වෙනුවෙන් ක්‍රියා කිරීමට හැකිය. මෙම මට්ටමේ පාලනය බොහොමයක් යෙදුම් සඳහා සුදුසු නැත."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> නවත්වන්නද?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"හරි ස්පර්ශ කිරීම <xliff:g id="SERVICE">%1$s</xliff:g> නවත්වනු ඇත."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"සේවා ස්ථාපනය කර නැත"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"සේවාවක් තෝරාගෙන නැත"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"කිසිඳු විස්තරයක් සපයා නොමැත."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"බාධා නොකරන්න යාවත්කාලීන කරන්න"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"අවධානය යොමු කිරීම සඳහා දැනුම්දීම් විරාම කරන්න"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"මෙම විශේෂාංගය නොමැත"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"එය මෙම දුරකථනය මන්දගාමී කරනු ඇත"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"කාර්ය චක්‍රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්‍යාත"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"පසුබිම් ක්‍රියාකාරකම් පටන් ගැනීමට ඉඩ දෙන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 20806e0..5434eef 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Tvár bola pridaná"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Klepnutím nastavíte overenie tvárou"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Overenie tvárou"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Použiť nastavenie dostupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Používajte tvár na odomykanie telefónu, schvaľovanie nákupov a prihlasovanie sa do aplikácií."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odomykajte telefón a schvaľujte nákupy tvárou.\n\nUpozornenie: Toto zariadenie nemôžete odomykať tvárou. Ďalšie informácie vám poskytne správca organizácie."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Používajte tvár na odomykanie telefónu, schvaľovanie nákupov a prihlasovanie sa do aplikácií"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Umiestnite svoju tvár do kruhu"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Neskôr"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maximálny počet tvárí, ktoré je možné pridať: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -1879,7 +1886,7 @@
     <string name="install_text" msgid="884360662922471113">"Inštalovať"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktivovať"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povoliť"</string>
-    <string name="clear_user_data_text" msgid="355574089263023363">"Vymazať úložisko"</string>
+    <string name="clear_user_data_text" msgid="355574089263023363">"Vymazať priestor"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinštalovať aktualizácie"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom."</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Azúrová"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Žltá"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Zapnúť funkciu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potrebuje:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Nastavenia nemôžu overiť vašu odpoveď, pretože určitá aplikácia blokuje žiadosť o povolenie."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ak zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj kód PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoje heslo."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> vyžaduje úplnú kontrolu nad týmto zariadením. Táto služba môže čítať obrazovku a konať v mene používateľov, ktorí vyžadujú funkcie dostupnosti. Pre väčšinu aplikácií nie je táto úroveň kontroly primeraná."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vypnúť funkciu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Klepnutím na tlačidlo OK vypnete funkciu <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nie sú nainštalované žiadne služby"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nie je vybratá žiadna služba"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
@@ -2534,7 +2561,7 @@
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"Zapnúť automaticky"</string>
     <string name="battery_saver_auto_no_schedule" msgid="632243833320671052">"Žiadny plán"</string>
     <string name="battery_saver_auto_routine" msgid="8076053160450346731">"Podľa vášho bežného správania"</string>
-    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Podľa percenta"</string>
+    <string name="battery_saver_auto_percentage" msgid="9000542338151528905">"Podľa percent"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3030089882678228374">"Ak je pravdepodobné, že sa batéria pred opätovným pripojením do siete vybije, zapne sa šetrič batérie."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"Zapne sa na úrovni <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Nastavenie plánu"</string>
@@ -3836,7 +3863,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predvolené)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Systémová)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predvolená systémová)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Úložisko aplikácií"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Ukladací priestor aplikácií"</string>
     <string name="usage_access" msgid="5479504953931038165">"Prístup k dátam o využití"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Povoliť prístup k využitiu"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Predvoľby využitia aplikáciami"</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizovať režim bez vyrušení"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pozastavte upozornenia, aby ste sa mohli sústrediť"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Táto funkcia nie je v zariadení k dispozícii"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Táto funkcia nie je k dispozícii"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Spomalí tento telefón"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vynútiť úplné meranie GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sledovať všetky konštelácie a frekvencie GNSS bez cyklického vypínania a zapínania"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Povoliť spúšťanie aktivity na pozadí"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9f0f067..a03e7fa 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Obraz je dodan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Dotaknite se za nast. preverjanja obraza"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Preverjanje obraza"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Uporabi nastavitev dostopnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Uporabljajte obraz za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Z obrazom odklenite telefon ali odobrite nakupe.\n\nOpomba: obraza ne morete uporabiti za odklepanje te naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Uporabljajte obraz za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Obraz poravnajte s krogom"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Pozneje"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Dodate lahko največ toliko obrazov: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Rumena"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ker aplikacija zakriva zahtevo za dovoljenje, z nastavitvami ni mogoče preveriti vašega odziva."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Če vklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>, vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi kodo PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi geslo."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> zahteva popoln nadzor nad to napravo. Storitev lahko prebere zaslon in deluje v imenu uporabnikov s posebnimi potrebami. Ta raven nadzora za večino aplikacij ni primerna."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Želite izklopiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Če se dotaknete »V redu«, ustavite storitev <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nameščena ni nobena storitev"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nobena storitev ni izbrana"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
@@ -4113,7 +4140,7 @@
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> podatkov v mobilnem omrežju"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> podatkov prek omrežij Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> podatkov prek etherneta"</string>
-    <string name="billing_cycle" msgid="6614597736285325497">"Opoz. in omej. za prenos pod."</string>
+    <string name="billing_cycle" msgid="6614597736285325497">"Opozorilo in omejitev za prenos podatk."</string>
     <string name="app_usage_cycle" msgid="8877223251648092131">"Cikel porabe podatkov aplikacije"</string>
     <string name="cell_data_warning" msgid="1985956818884847057">"Opozorilo ob preneseni količini podatkov <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="1578367585799358854">"Omejitev prenosa podatkov pri <xliff:g id="ID_1">^1</xliff:g>"</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Posodobitev načina »ne moti«"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Začasno zaustavite prikazovanje obvestil, da ostanete osredotočeni"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ta funkcija ni na voljo"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Upočasnila bo delovanje tega telefona"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vsili popolne meritve GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Dovoli začetek dejavnosti v ozadju"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b647e36..a0acf785 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Fytyra u shtua"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Trokit për të vendosur vërtetimin me fytyrë"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Vërtetimi me fytyrë"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Përdor konfigurimin e qasshmërisë"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Përdor fytyrën për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Përdor fytyrën për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Nuk mund ta përdorësh fytyrën tënde për të shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës sate."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Përdor fytyrën për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Mbaje fytyrën në mes të rrethit"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Bëje më vonë"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> fytyra"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Gurkali"</string>
     <string name="color_yellow" msgid="9112680561610873529">"E verdhë"</string>
     <string name="color_magenta" msgid="5059212823607815549">"E purpurt"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Të përdoret \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"\"<xliff:g id="SERVICE">%1$s</xliff:g>\" ka nevojë të:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Duke qenë se një aplikacion po bllokon një kërkesë për leje, \"Cilësimet\" nuk mund të verifikojnë përgjigjen tënde."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nëse aktivizon <xliff:g id="SERVICE">%1$s</xliff:g>, pajisja nuk do të përdorë kyçjen e ekranit për të rritur enkriptimin e të dhënave."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Duke qenë se aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh kodin PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Meqenëse aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh fjalëkalimin tënd."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> po kërkon kontroll të plotë të kësaj pajisjeje. Shërbimi mund të lexojë ekranin dhe të veprojë në emër të përdoruesve me nevoja qasshmërie. Ky nivel kontrolli nuk është i përshtatshëm për shumicën e aplikacioneve."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Të ndalohet shërbimi \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Trokitja te \"Në rregull\" do të ndalojë shërbimin <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nuk është instaluar asnjë shërbim"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nuk është zgjedhur asnjë shërbim"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nuk është dhënë asnjë përshkrim."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Përditëso modalitetin \"Mos shqetëso\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Vendos njoftimet në pauzë për të qëndruar i fokusuar"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ky funksion nuk ofrohet në këtë pajisje"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ky funksion nuk ofrohet"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Ai do ta ngadalësojë këtë telefon"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Matjet GNSS me fuqi të plotë"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Gjurmo të gjitha koleksionet dhe frekuencat e GNSS pa ciklim të detyruar"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Lejo nisjet e aktiviteteve në sfond"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e0e2673..97dca90 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -402,6 +402,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Лице је додато"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Додиром подесите потврду идентитета лицем"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Потвр. идентит. лицем"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Користите подеш. за приступачн."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -412,7 +417,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Откључавајте телефон, одобравајте куповине или се пријављујте у апликације помоћу лица."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Откључавајте телефон или одобравајте куповине помоћу лица.\n\nНапомена: Не можете да откључавате овај уређај помоћу лица. Више информација затражите од администратора организације."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Откључавајте телефон, одобравајте куповине или се пријављујте у апликације помоћу лица"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Поставите лице у центар круга"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Урадићу то касније"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Максималан број лица који можете да додате је <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -959,7 +966,7 @@
     <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"Поставите QR кôд у наставку да бисте додали уређај на мрежу „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"Скенирај QR кôд"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"Поставите QR кôд у наставку да бисте додали уређај на мрежу „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Придружите се Wi‑Fi мрежи тако што ћете скенирати QR кôд"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"Повежите се на Wi‑Fi мрежу тако што ћете скенирати QR кôд"</string>
     <string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Дели Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Скенирајте овај QR кôд да бисте се повезали са „<xliff:g id="SSID">%1$s</xliff:g>“ и делили лозинку"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Скенирајте овај QR кôд да бисте се придружили мрежи „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
@@ -2215,7 +2222,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Цијан"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Жута"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
@@ -2224,8 +2232,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите лозинку."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> тражи потпуну контролу над овим уређајем. Услуга може да чита садржај са екрана и да обавља разне задатке за кориснике услуга приступачности. Овај ниво контроле није одговарајући за већину апликација."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Желите ли да зауставите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ако додирнете Потврди, зауставићете <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ниједна услуга није инсталирана"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ниједна услуга није изабрана"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
@@ -4068,7 +4095,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ограничење за потрошњу података"</string>
     <string name="data_usage_template" msgid="2923744765873163859">"Искористили сте <xliff:g id="ID_1">%1$s</xliff:g> у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигуришите"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Друге апликације укључене у употребу"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Друге апликације које су трошиле податке"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозволу да користи неограничену количину података када је Уштеда података укључена</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> апликације имају дозволу да користе неограничену количину података када је Уштеда података укључена</item>
@@ -4393,8 +4420,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирајте режим Не узнемиравај"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте обавештења ради боље концентрације"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ова функција није доступна на овом уређају."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ова функција није доступна"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Успориће овај телефон"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Принудно покрени пуна GNSS мерења"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Прати све GNSS консталације и фреквенције без циклуса рада"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Дозволи покретање апликација у позадини"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d427cea..740c7fd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansikte har lagts till"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tryck för att ange ansiktsautentisering"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Ansiktsautentisering"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Tillgänglighetskonfiguration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Lås upp mobilen, godkänn köp eller logga in i appar med ditt ansikte."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Lås upp mobilen eller godkänn köp med hjälp av ansiktet.\n\nObs! Du kan inte låsa upp den här enheten med hjälp av ansiktet. Kontakta organisationens administratör om du vill veta mer."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Lås upp mobilen, godkänn köp eller logga in i appar med ditt ansikte"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrera ansiktet i cirkeln"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gör det senare"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> ansikten"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Svaret kan inte verifieras av Inställningar, eftersom en app skymmer en begäran om behörighet."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> används inte skärmlåset för att förbättra datakryptering på enheten."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta din pinkod."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt lösenord."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> begär fullständig kontroll över den här enheten. Tjänsten kan läsa på skärmen och utföra åtgärder åt användare med behov av tillgänglighet. Den här kontrollnivån är olämplig för de flesta appar."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Vill du avbryta <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Om du trycker på OK avbryts <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Inga tjänster är installerade"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ingen tjänst har valts"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Uppdatera Stör ej"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa aviseringar så du kan behålla ditt fokus"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Den här funktionen är inte tillgänglig på den här enheten."</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Funktionen är inte tillgänglig"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Funktionen gör att den här mobilen fungerar långsammare"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Framtvinga fullständiga GNSS-mätningar"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spåra alla konstellationer och frekvenser för GNSS utan arbetscykel"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Tillåt att aktiviteter startas i bakgrunden"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c9b5389..d68a342 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Imeongeza utambuzi wa uso"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Gusa ili uweke utambuzi wa uso"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Utambuzi wa uso"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Tumia mipangilio ya ufikivu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Tumia uso wako kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti za programu."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Tumia uso wako kufunga simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia uso wako kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Tumia uso wako kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti za programu."</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Weka uso wako katikati ya mduara"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Andikisha uso baadaye"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Unaweza kuongeza hadi nyuso <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -1854,7 +1861,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Badilisha mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kubadilisha mapendeleo ya programu?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Kufanya hivi kutabadilisha mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguomsingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Kufanya hivi kutabadilisha mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>"Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguomsingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Samawati-Kijani"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Manjano"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Majenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Kwa sababu programu yako inazuia ombi la ruhusa, Mipangilio haiwezi kuthibitisha majibu yako."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukiwasha <xliff:g id="SERVICE">%1$s</xliff:g>, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha PIN yako."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha nenosiri lako."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> inaomba udhibiti kamili wa kifaa hiki. Huduma hii inaweza kusoma skrini na ichukue hatua kwa niaba ya watumiaji walio na matatizo ya kuona au kusikia. Kiwango hiki cha udhibiti hakifai kwa programu nyingi."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Ungependa kuzima <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Kugusa Sawa kutazima huduma ya <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Hakuna huduma iliyochaguliwa"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
@@ -2866,7 +2893,7 @@
     <string name="user_settings_title" msgid="3493908927709169019">"Watumiaji wengi"</string>
     <string name="user_settings_footer_text" product="device" msgid="5947601460660791129">"Shiriki kifaa chako kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye kifaa chako kwa ajili ya Skrini ya kwanza, akaunti, programu, mipangilio na vipengee vingine maalum."</string>
     <string name="user_settings_footer_text" product="tablet" msgid="2153761434649733502">"Shiriki kompyuta yako kibao kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye kompyuta yako kibao kwa ajili ya Skrini ya kwanza, akaunti, programu, mipangilio na vipengee vingine maalum"</string>
-    <string name="user_settings_footer_text" product="default" msgid="2844602828189838075">"Shiriki simu yako kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye simu yako kwa ajili ya Skrini ya kwanza, akaunti, programu, mipangilio na vipengee vingine maalum."</string>
+    <string name="user_settings_footer_text" product="default" msgid="2844602828189838075">"Shiriki simu yako kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye simu yako ya kuweka Skrini ya Kwanza, akaunti, programu, mipangilio na vipengee vingine maalum kwake."</string>
     <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ongeza mtumiaji au wasifu"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
@@ -2918,7 +2945,7 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ungependa kumwondoa mgeni?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Data na programu zote katika kipindi hiki zitafutwa."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ondoa"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"Washa kipengele cha kupiga simu"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ruhusu upigaji simu"</string>
     <string name="user_enable_calling_sms" msgid="9172507088023097063">"Washa kipengele cha SMS na kupiga simu"</string>
     <string name="user_remove_user" msgid="3612979309028881318">"Futa mtumiaji"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Kipengele cha kupiga simu kiwashwe?"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Sasisha kipengele cha Usinisumbue"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sitisha arifa ili uendelee kumakinika"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Kipengele hiki hakipatikani kwenye kifaa hiki"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Kipengele hiki hakipatikani"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Hali hii itapunguza kasi ya kifaa chako"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Lazimisha vipimo vya GNSS kamili"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Fuatilia mikusanyiko na mawimbi yote yasiyo na utendakazi wa GNSS"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Iruhusu kuanza shughuli chinichini"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cb21f97..e88c15b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -396,6 +396,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"முகம் சேர்க்கப்பட்டது"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"முக அங்கீகாரத்தை அமைக்க, தட்டவும்"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"முக அங்கீகாரம்"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"அணுகல்தன்மை அமைவைப் பயன்படுத்து"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -406,7 +411,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"மொபைலைத் திறக்க, வாங்குதல்களை அங்கீகரிக்க &amp; ஆப்ஸில் உள்நுழைய, உங்கள் முகத்தைப் பயன்படுத்தலாம்."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"மொபைலைத் திறக்கவோ, பொருட்கள் வாங்குவதை அங்கீகரிக்கவோ, உங்கள் முகத்தைப் பயன்படுத்தவும். \n\nகவனத்திற்கு: இந்தச் சாதனத்தைத் திறப்பதற்கு, உங்கள் முகத்தைப் பயன்படுத்த இயலாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"மொபைலைத் திறக்க, வாங்குதல்களை அங்கீகரிக்க &amp; ஆப்ஸில் உள்நுழைய, உங்கள் முகத்தைப் பயன்படுத்தலாம்"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"வட்டத்தின் மையத்தில் முகத்தைக் காட்டவும்"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"பின்னர் செய்"</string>
     <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> முகங்கள் வரை சேர்க்கலாம்"</string>
@@ -2201,7 +2208,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"சியான்"</string>
     <string name="color_yellow" msgid="9112680561610873529">"மஞ்சள்"</string>
     <string name="color_magenta" msgid="5059212823607815549">"மெஜந்தா"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையைப் பயன்படுத்தவா?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> செய்வது:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"அனுமதிக் கோரிக்கையை ஆப்ஸ் மறைப்பதால், அமைப்புகளால் உங்கள் பதிலைச் சரிபார்க்க முடியாது."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ இயக்கினால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
@@ -2210,8 +2218,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், பின்னை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், கடவுச்சொல்லை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"இந்தச் சாதனத்திற்கான முழுக் கட்டுப்பாட்டையும் <xliff:g id="SERVICE">%1$s</xliff:g> கோருகிறது. இந்தச் சேவை உங்கள் திரையில் தோன்றுவதைப் படித்து, பயனர்களுக்குத் தேவையான அணுகல்களைப் பெற அவர்களின் சார்பில் செயல்படும். இப்போதுள்ள கட்டுப்பாடு பெரும்பாலான ஆப்ஸுக்குப் பொருந்தவில்லை."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை நிறுத்தவா?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"சரி என்பதைத் தட்டினால், <xliff:g id="SERVICE">%1$s</xliff:g> நிறுத்தப்படும்."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"சேவைகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"சேவை எதையும் தேர்ந்தெடுக்கவில்லை"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"விளக்கம் எதுவும் வழங்கப்படவில்லை."</string>
@@ -3358,24 +3385,15 @@
     <string name="swipe_direction_title" msgid="6877543492435053137">"ஸ்வைப் செயல்கள்"</string>
     <string name="swipe_direction_ltr" msgid="3623394320915041215">"நிராகரிக்க வலப்புறமும் மெனுவைக் காண்பிக்க இடப்புறமும் ஸ்வைப் செய்யவும்"</string>
     <string name="swipe_direction_rtl" msgid="4972099509548044938">"நிராகரிக்க இடப்புறமும் மெனுவைக் காண்பிக்க வலப்புறமும் ஸ்வைப் செய்யவும்"</string>
-    <!-- no translation found for gentle_notifications_title (3976374971153475110) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_also_display (6455360420411828133) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_status (2904115658980383410) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_lock (1395567209329239992) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_education (8713358646047345762) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_summary_shade (6583107817329430916) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_summary_shade_lock (1434426811760016414) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_summary_shade_status (6113566548809874319) -->
-    <skip />
-    <!-- no translation found for gentle_notifications_display_summary_shade_status_lock (4222628772925544654) -->
-    <skip />
+    <string name="gentle_notifications_title" msgid="3976374971153475110">"அமைதியான அறிவிப்புகள்"</string>
+    <string name="gentle_notifications_also_display" msgid="6455360420411828133">"இதிலும் காட்டப்படும்"</string>
+    <string name="gentle_notifications_display_status" msgid="2904115658980383410">"நிலைப் பட்டி"</string>
+    <string name="gentle_notifications_display_lock" msgid="1395567209329239992">"பூட்டுத் திரை"</string>
+    <string name="gentle_notifications_education" msgid="8713358646047345762">"அமைதியான அறிவிப்புகள் எப்போதும் ஒலியின்றி இருப்பதோடு கீழ் இழுக்கும் ஷேடில் காட்டப்படும்"</string>
+    <string name="gentle_notifications_display_summary_shade" msgid="6583107817329430916">"கீழ் இழுக்கும் ஷேடில் மட்டும் காட்டப்படும்"</string>
+    <string name="gentle_notifications_display_summary_shade_lock" msgid="1434426811760016414">"கீழ் இழுக்கும் ஷேட் &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
+    <string name="gentle_notifications_display_summary_shade_status" msgid="6113566548809874319">"கீழ் இழுக்கும் ஷேட் &amp; நிலைப் பட்டியில் காட்டப்படும்"</string>
+    <string name="gentle_notifications_display_summary_shade_status_lock" msgid="4222628772925544654">"கீழ் இழுக்கும் ஷேட், நிலைப்பட்டி &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
     <string name="lock_screen_notifications_title" msgid="7604704224172951090">"பூட்டுத் திரை"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"பணிக் கணக்கு பூட்டியிருந்தால்"</string>
@@ -4348,8 +4366,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"தொந்தரவு செய்ய வேண்டாம் அமைப்பைப் புதுப்பிக்கவும்"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"கவனம் சிதறாமல் இருக்க, அறிவிப்புகளை இடைநிறுத்தவும்"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"இந்தச் சாதனத்தில் இந்த அம்சம் இல்லை"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"இந்த அம்சம் கிடைக்காது"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"இது உங்கள் மொபைலைத் தாமதப்படுத்தும்"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"முழுமையான GNSS அளவீடுகளை அமலாக்கு"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"பணி சுழற்சியை முடக்கி, GNSS வழிசெலுத்துதல்கள் மற்றும் அதிர்வெண்கள் அனைத்தையும் கண்காணித்தல்."</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"பின்னணிச் செயல்பாடு தொடங்க அனுமதி"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 0ca71a4..8fc4b8d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ముఖం జోడించబడింది"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ముఖ ప్రామాణీకరణ‌ను సెటప్ చేయడానికి నొక్కండి"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ముఖ ప్రామాణీకరణ"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"యాక్సెసిబిలిటీ సెటప్‌ని ఉపయోగించు"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా యాప్‌లలోకి సైన్-ఇన్ చేయడానికి మీ ముఖాన్ని ఉపయోగించండి."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ ముఖాన్ని ఉపయోగించండి.\n\nగమనించండి: మీరు మీ ముఖాన్ని ఉపయోగించి ఈ పరికరాన్ని అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా యాప్‌లలోకి సైన్-ఇన్ చేయడానికి మీ ముఖాన్ని ఉపయోగించండి"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"వృత్తం మధ్యలో వచ్చేలా మీ ముఖాన్ని ఉంచండి"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"దీనిని తర్వాత చేయి"</string>
     <string name="face_add_max" msgid="4408683751143942949">"మీరు <xliff:g id="COUNT">%d</xliff:g> వరకు ముఖాలను జోడించవచ్చు"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"నీలి ఆకుపచ్చ రంగు"</string>
     <string name="color_yellow" msgid="9112680561610873529">"పసుపు రంగు"</string>
     <string name="color_magenta" msgid="5059212823607815549">"మెజెంటా"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక యాప్ అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> ఈ పరికరం యొక్క పూర్తి నియంత్రణను కోరుతుంది. ఈ సేవ స్క్రీన్‌పై కనిపించే అంశాలను చదవగలదు, అదేవిధంగా వినియోగదారుల తరపున యాక్సెసిబిలిటీ చర్యలను తీసుకోగలదు. ఈ స్థాయి నియంత్రణ చాలా వ‌ర‌కు యాప్‌లకు సరికాదు."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ఆపివేయాలా?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"సరే నొక్కడం వలన <xliff:g id="SERVICE">%1$s</xliff:g> ఆపివేయబడుతుంది."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"సేవలు ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ఏ సేవను ఎంచుకోలేదు"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"వివరణ ఏదీ అందించబడలేదు."</string>
@@ -4316,8 +4343,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"అంతరాయం కలిగించవద్దును అప్‌డేట్ చేయి"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"ఇతర వ్యాపకాలపై దృష్టి మరలకుండా ఉండడానికి నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ఈ ఫీచర్ అందుబాటులో లేదు"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"దీని వలన ఈ ఫోన్ పనితీరు నెమ్మదిస్తుంది"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"శక్తివంతమైన GNSS కొలతలు"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"బ్యాక్‌గ్రౌండ్ కార్యకలాపం మొదలవ్వడానికి అనుమతి ఇవ్వు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bfcb120..ed04ba1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"เพิ่มใบหน้าแล้ว"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"แตะเพื่อตั้งค่าตรวจสอบสิทธิ์ด้วยใบหน้า"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"ตรวจสิทธิ์ด้วยใบหน้า"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ใช้การตั้งค่าการช่วยเหลือพิเศษ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอป"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์นี้ไม่ได้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอป"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"จัดใบหน้าของคุณให้อยู่กลางวงกลม"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ข้ามไปก่อน"</string>
     <string name="face_add_max" msgid="4408683751143942949">"คุณเพิ่มใบหน้าได้สูงสุด <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
@@ -883,7 +890,7 @@
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"ค่ากำหนด Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"เปิด Wi‑Fi อีกครั้งโดยอัตโนมัติ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"ไม่เปิด Wi‑Fi อีกครั้งโดยอัตโนมัติ"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"เครือข่าย WiFi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"เครือข่าย Wi-Fi"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ตัวเลือกอื่น"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
@@ -941,9 +948,9 @@
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="1539659414108891004">"MAC แบบสุ่ม"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8674936581557695411">"เพิ่มอุปกรณ์"</string>
     <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"ถือให้โค้ด QR อยู่กลางช่องด้านล่างเพื่อเพิ่มอุปกรณ์ไปยัง “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
-    <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"สแกนโค้ด QR"</string>
+    <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"สแกนคิวอาร์โค้ด"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"ถือให้โค้ด QR อยู่กลางช่องด้านล่างเพื่อเชื่อมต่อไปยัง “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"เข้าร่วม Wi‑Fi โดยการสแกนโค้ด QR"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"เข้าร่วม Wi‑Fi โดยการสแกนคิวอาร์โค้ด"</string>
     <string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"แชร์ Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"สแกนโค้ด QR นี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>” และแชร์รหัสผ่าน"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"สแกนโค้ด QR นี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"ฟ้า"</string>
     <string name="color_yellow" msgid="9112680561610873529">"เหลือง"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ม่วงแดง"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ใช่ไหม"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"เนื่องจากแอปหนึ่งได้บดบังคำขอสิทธิ์ ระบบจึงไม่สามารถยืนยันคำตอบของคุณสำหรับการตั้งค่าได้"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"หากคุณเปิด <xliff:g id="SERVICE">%1$s</xliff:g> อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"คุณต้องยืนยัน PIN เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"คุณต้องยืนยันรหัสผ่าน เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> กำลังขอควบคุมอุปกรณ์นี้โดยสมบูรณ์ บริการนี้จะอ่านหน้าจอและดำเนินการในนามของผู้ใช้ที่ต้องการการช่วยเหลือพิเศษได้ การควบคุมระดับนี้ไม่เหมาะสำหรับแอปส่วนใหญ่"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"การแตะตกลงจะหยุดใช้ <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"ไม่ได้เลือกบริการ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
@@ -2441,7 +2468,7 @@
     <string name="battery_full_charge_last" msgid="8892335687734288031">"การชาร์จเต็มใช้งานได้นานประมาณ"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"ข้อมูลการใช้งานแบตเตอรี่เป็นเพียงการประมาณการและอาจเปลี่ยนไปตามการใช้งาน"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ขณะใช้งานอยู่"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"ขณะอยู่ในพื้นหลัง"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"ขณะทำงานอยู่เบื้องหลัง"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"การใช้งานแบตเตอรี่"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"ตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"จัดการการใช้งานแบตเตอรี่"</string>
@@ -2453,7 +2480,7 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"การใช้งานตั้งแต่ถอดปลั๊กของ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ยอดใช้งานรวม"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"รีเฟรช"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการของ Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"การเพิ่มประสิทธิภาพแอป"</string>
     <string name="battery_saver" msgid="8172485772238572153">"โหมดประหยัดแบตเตอรี่"</string>
@@ -3594,7 +3621,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"เปิด"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ปิด"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"การตรึงหน้าจอ"</string>
-    <string name="screen_pinning_description" msgid="1110847562111827766">"เมื่อเปิดการตั้งค่านี้ คุณจะใช้การตรึงหน้าจอเพื่อให้หน้าจอปัจจุบันอยู่ในมุมมองตลอดจนกว่าจะเลิกตรึงได้\n\nวิธีใช้การตรึงหน้าจอ\n\n1. ดูว่าคุณเปิดใช้การตรึงหน้าจอแล้ว\n\n2. เปิด \"ภาพรวม\"\n\n3. แตะไอคอนแอปที่ด้านบนของหน้าจอ แล้วแตะ \"ตรึง\""</string>
+    <string name="screen_pinning_description" msgid="1110847562111827766">"เมื่อเปิดการตั้งค่านี้ คุณจะใช้การตรึงหน้าจอเพื่อให้หน้าจอปัจจุบันอยู่ในมุมมองตลอดได้จนกว่าจะเลิกตรึง\n\nวิธีใช้การตรึงหน้าจอ\n\n1. ดูว่าคุณเปิดใช้การตรึงหน้าจอแล้ว\n\n2. เปิด \"ภาพรวม\"\n\n3. แตะไอคอนแอปที่ด้านบนของหน้าจอ แล้วแตะ \"ตรึง\""</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ขอรูปแบบการปลดล็อกก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ขอ PIN ก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ขอรหัสผ่านก่อนเลิกตรึง"</string>
@@ -3996,7 +4023,7 @@
     <string name="data_used_template" msgid="3245919669966296505">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ตั้งค่าเตือนการใช้อินเทอร์เน็ต"</string>
     <string name="data_warning" msgid="209133958008062117">"เตือนปริมาณอินเทอร์เน็ต"</string>
-    <string name="data_warning_footnote" msgid="776341964125603711">"อุปกรณ์จะวัดคำเตือนปริมาณอินเทอร์เน็ตและขีดจำกัดอินเทอร์เน็ต ซึ่งอาจต่างจากข้อมูลของผู้ให้บริการ"</string>
+    <string name="data_warning_footnote" msgid="776341964125603711">"อุปกรณ์จะวัดข้อมูลสำหรับขีดจำกัดและคำเตือนปริมาณอินเทอร์เน็ต ซึ่งอาจต่างจากข้อมูลของผู้ให้บริการ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ตั้งค่าขีดจำกัดอินเทอร์เน็ต"</string>
     <string name="data_limit" msgid="1885406964934590552">"ขีดจำกัดอินเทอร์เน็ต"</string>
     <string name="data_usage_template" msgid="2923744765873163859">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g> ช่วงวันที่ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"อัปเดตโหมดห้ามรบกวน"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"หยุดการแจ้งเตือนชั่วคราวเพื่อไม่ให้มีสิ่งรบกวน"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ฟีเจอร์นี้ไม่สามารถใช้ได้บนอุปกรณ์นี้"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"ฟีเจอร์นี้ไม่พร้อมใช้งาน"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"ฟีเจอร์ดังกล่าวจะทำให้โทรศัพท์เครื่องนี้ทำงานช้าลง"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"บังคับใช้การวัด GNSS เต็มรูปแบบ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ติดตามระบบดาวเทียมและความถี่สัญญาณ GNSS ทั้งหมดโดยไม่มีการปิดพักเพื่อประหยัดพลังงาน"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"อนุญาตให้เริ่มกิจกรรมในเบื้องหลัง"</string>
@@ -4421,7 +4450,7 @@
     <string name="carrier_settings_title" msgid="3503012527671299886">"การตั้งค่าผู้ให้บริการ"</string>
     <string name="cdma_lte_data_service" msgid="8507044148856536098">"ตั้งค่าบริการข้อมูล"</string>
     <string name="mobile_data_settings_title" msgid="7674604042461065482">"เน็ตมือถือ"</string>
-    <string name="mobile_data_settings_summary" msgid="2708261377199805404">"เข้าถึงข้อมูลโดยใช้เครือข่ายมือถือ"</string>
+    <string name="mobile_data_settings_summary" msgid="2708261377199805404">"เข้าถึงอินเทอร์เน็ตโดยใช้เครือข่ายมือถือ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="2914985502279794000">"โทรศัพท์จะเปลี่ยนไปใช้ผู้ให้บริการรายนี้โดยอัตโนมัติเมื่ออยู่ในพื้นที่ให้บริการ"</string>
     <string name="calls_preference" msgid="4628557570999372758">"ค่ากำหนดการโทร"</string>
     <string name="sms_preference" msgid="3479810211828513772">"ค่ากำหนด SMS"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 77223c4..7a63e0f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Naidagdag ang mukha"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Tap at set up, i-authenticate ang mukha"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"I-authenticate, mukha"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Gamitin ang accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gamitin ang iyong mukha para i-unlock ang telepono mo, awtorisahan ang mga pagbili, o mag-sign in sa mga app."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gamitin ang iyong mukha para i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Hindi mo maaaring gamitin ang iyong mukha para i-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gamitin ang iyong mukha para i-unlock ang telepono mo, awtorisahan ang mga pagbili, o mag-sign in sa mga app"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Igitna ang iyong mukha sa bilog"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gawin ito mamaya"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maaari kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) mukha"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Dilaw"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Dahil pinipigilan ng isang app ang kahilingan ng pahintulot, hindi ma-verify ng Mga Setting ang iyong tugon."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kung io-on mo ang <xliff:g id="SERVICE">%1$s</xliff:g>, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong password."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Humihiling ang <xliff:g id="SERVICE">%1$s</xliff:g> ng ganap na kontrol sa device na ito. Maaaring basahin ng serbisyo ang screen at kumilos sa ngalan ng mga user na may mga pangangailangan sa accessibility. Hindi naaangkop ang ganitong antas ng kontrol para sa karamihan ng mga app."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Ihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Kapag na-tap ang OK, matitigil ang <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Walang mga serbisyong naka-install"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Walang serbisyong napili"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
@@ -3509,7 +3536,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Araw-araw"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Maaaring i-override ng alarm ang oras ng pagtatapos"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="1673667979187593693">"Nag-o-off ang iskedyul kapag may nag-ring na alarm"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Pagkilos ng Huwag Istorbohin"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Aksyon ng Huwag Istorbohin"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"Gamitin ang mga default na setting"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"Gumawa ng mga custom na setting para sa iskedyul na ito"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"Para sa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"I-update ang Huwag Istorbohin"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"I-pause ang mga notification para manatiling nakatuon ang pansin"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hindi available ang feature na ito sa device na ito"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Hindi available ang feature na ito"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Pababagalin nito ang teleponong ito"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Ipatupad ang kumpletong sukat ng GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sinusubaybayan ang lahat ng constellation at dalas ng GNSS nang walang duty cycling"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Payagang magsimula ng aktibidad sa background"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5548dc2..b2ff29d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -276,7 +276,7 @@
       <item quantity="other">Seçilen diller kaldırılsın mı?</item>
       <item quantity="one">Seçilen dil kaldırılsın mı?</item>
     </plurals>
-    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Metin bir başka dilde görüntülenecek."</string>
+    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Metin başka bir dilde görüntülenecek."</string>
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Tüm diller kaldırılamaz"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Tercih edilen en az dil bırakın"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"Bazı uygulamalarda kullanılamayabilir"</string>
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Yüz eklendi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Yüzle kimlik doğrulamayı kurmak için dokunun"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Yüzle kimlik doğrulama"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Erişilebilirlik kurulumunu kullan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için yüzünüzü kullanın."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için yüzünüzü kullanın.\n\nNot: Bu cihazın kilidini açmak için yüzünüzü kullanamazsınız. Daha fazla bilgi için kuruluşunuzun yöneticisine başvurun."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için yüzünüzü kullanın"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Yüzünüzü çemberin ortasına getirin"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Daha sonra yap"</string>
     <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> adede kadar yüz ekleyebilirsiniz"</string>
@@ -1346,7 +1353,7 @@
     <string name="status_number_sim_slot" product="default" msgid="1898212200138025729">"Telefon numarası (SIM yuvası %1$d)"</string>
     <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"SIM\'deki MDN"</string>
     <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"SIM\'deki telefon numarası"</string>
-    <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRL sürümü"</string>
     <string name="meid_multi_sim" msgid="748999971744491771">"MEID (SIM yuvası %1$d)"</string>
@@ -1356,8 +1363,8 @@
     <string name="scanning_status_text_wifi_off_ble_off" msgid="6381094990708345188">"Kablosuz ağ ve Bluetooth taraması kapalı"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
-    <string name="status_data_network_type" msgid="7570837037428932780">"Mobil veri ağ türü"</string>
-    <string name="status_voice_network_type" msgid="5663112239742353547">"Mobil ses ağ türü"</string>
+    <string name="status_data_network_type" msgid="7570837037428932780">"Mobil veri ağı türü"</string>
+    <string name="status_voice_network_type" msgid="5663112239742353547">"Mobil ses ağı türü"</string>
     <string name="status_latest_area_info" msgid="7222470836568238054">"Operatör bilgileri"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobil ağ durumu"</string>
     <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
@@ -1659,8 +1666,8 @@
     <string name="location_app_level_permissions" msgid="2777033567595680764">"Uygulama izni"</string>
     <string name="location_app_permission_summary_location_off" msgid="2790918244874943070">"Konum özelliği kapalı"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="5336807018727349708">
-      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> / <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> uygulamanın konuma erişimi var</item>
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> / <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> uygulamanın konuma erişimi var</item>
+      <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> uygulamadan <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> tanesinin konuma erişimi var</item>
+      <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> uygulamadan <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> tanesinin konuma erişimi var</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="4911449278675337490">"Son konum erişimi"</string>
     <string name="location_recent_location_access_view_details" msgid="1955078513330927035">"Ayrıntıları göster"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Camgöbeği"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Sarı"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Macenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Bir uygulama bir izin isteğinin anlaşılmasını engellediğinden, Ayarlar, yanıtınızı doğrulayamıyor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini açarsanız cihazınız veri şifrelemeyi geliştirmek için ekran kilidinizi kullanmaz."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden PIN\'inizi doğrulamanız gerekmektedir."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden şifrenizi doğrulamanız gerekmektedir."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>, bu cihazın tam kontrolünü istiyor. Hizmet, ekranı okuyabilir ve erişilebilirlik gereksinimleri olan kullanıcıların adına hareket edebilir. Bu kontrol düzeyi, çoğu uygulama için uygun değildir."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> hizmeti durdurulur."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Hizmet seçilmedi"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
@@ -2251,7 +2278,7 @@
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
     <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
-    <string name="power_usage_list_summary" msgid="5584049564906462506">"Tam şarjdan beri pil kullanımı"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"Tam şarjdan itibaren pil kullanımı"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
@@ -3245,7 +3272,7 @@
     <string name="zen_mode_block_effect_summary_sound" msgid="1065107568053759972">"Ses ve titreşim"</string>
     <string name="zen_mode_block_effect_summary_some" msgid="3635646031575107456">"Ses, titreşim ve bazı görsel bildirim işaretleri"</string>
     <string name="zen_mode_block_effect_summary_all" msgid="1213328945418248026">"Ses, titreşim ve görsel bildirim işaretleri"</string>
-    <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Temel telefon etkinliği ve durum için gereken bildirimler hiçbir zaman gizlenmez"</string>
+    <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Temel telefon etkinliği ve durumu için gereken bildirimler hiçbir zaman gizlenmez"</string>
     <string name="zen_mode_no_exceptions" msgid="7653433997399582247">"Yok"</string>
     <string name="zen_mode_other_options" msgid="520015080445012355">"diğer seçenekler"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Ekle"</string>
@@ -3488,7 +3515,7 @@
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"Bu ayarlar şu anda değiştirilemez. Bir uygulama (<xliff:g id="APP_NAME">%1$s</xliff:g>) Rahatsız Etmeyin ayarını özel bir davranışla otomatik olarak açtı."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Bu ayarlar şu anda değiştirilemez. Bir uygulama Rahatsız Etmeyin ayarını özel bir davranışla açtı."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Bu ayarlar şu an değiştirilemez. Rahatsız Etmeyin ayarı özel bir davranışla manuel olarak açıldı."</string>
-    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Saat"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Zaman"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Otomatik kural, belirtilen zamanlarda Rahatsız Etmeyin seçeneği açılacak şekilde ayarlandı"</string>
     <string name="zen_event_rule_type_name" msgid="6503468472212606158">"Etkinlik"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Otomatik kural, belirtilen etkinlikler sırasında Rahatsız Etmeyin seçeneği açılacak şekilde ayarlandı"</string>
@@ -3511,7 +3538,7 @@
     <string name="zen_mode_schedule_alarm_summary" msgid="1673667979187593693">"Alarm çaldığında program kapanır"</string>
     <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Rahatsız Etmeyin özelliğinin davranışı"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"Varsayılan ayarları kullan"</string>
-    <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"Bu plan için özel ayarlar oluştur"</string>
+    <string name="zen_mode_custom_behavior_summary" msgid="7458258833216726120">"Bu program için özel ayarlar oluştur"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="4070854282812755247">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" için"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -3559,7 +3586,7 @@
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"yıldız işaretli kişiler"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Tekrar arayanlar"</string>
     <string name="zen_mode_repeat_callers_list" msgid="2529895519653237330">"tekrar arayanlar"</string>
-    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Tekrarlı arayanlara izin ver"</string>
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Tekrar arayanlara izin ver"</string>
     <string name="zen_mode_calls_summary_one" msgid="1711737896388108388">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> tarafından gönderilenlere izin ver"</string>
     <string name="zen_mode_calls_summary_two" msgid="8476861928783654064">"İzin ver: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ve <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa"</string>
@@ -3577,8 +3604,8 @@
       <item quantity="one">Bir dakika için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
-      <item quantity="one">Bir saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> saat için yalnızca alarmlar olarak değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için yalnızca alarmlar olarak değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnızca şu saate kadar alarmlara geç: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
@@ -4292,7 +4319,7 @@
     <string name="autofill_app" msgid="7338387238377914374">"Otomatik doldurma hizmeti"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatik, doldur, otomatik doldur"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu uygulamaya güvendiğinizden emin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Otomatik Doldurma&gt;%1$s&lt;/xliff:g&gt; otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
-    <string name="debug_autofill_category" msgid="8050326960545979035">"Otomatik doldur"</string>
+    <string name="debug_autofill_category" msgid="8050326960545979035">"Otomatik Doldurma"</string>
     <string name="autofill_logging_level_title" msgid="899483289251346778">"Günlük kaydı düzeyi"</string>
     <string name="autofill_max_partitions" msgid="7590272120101271461">"Oturum başına maksimum istek"</string>
     <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimum görünür veri kümesi"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Rahatsız Etmeyin özelliğini güncelleyin"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Konsantrasyonunuzu bozmamak için bildirimleri duraklatın"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu özellik bu cihazda kullanılamıyor"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Bu özellik kullanılamıyor"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Söz konusu özellik bu telefonu yavaşlatır"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tam GNSS ölçümlerini zorla"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Tüm GNSS takımyıldızlarını ve görev döngüsü olmayan frekansları takip et"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Arka planda başlayan işlemlere izin ver"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 774b0fe..7ff1e5d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -405,6 +405,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Обличчя додано"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Торкніться, щоб налаштувати автентифікацію"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Автентифікація облич"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Показати параметри доступності"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -415,7 +420,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Розблоковуйте телефон, робіть покупки та входьте в додатки за допомогою розпізнавання облич."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Розблоковуйте телефон або схвалюйте покупки за допомогою зображення обличчя.\n\nПримітка. Цей пристрій не можна розблокувати таким чином. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Розблоковуйте телефон, робіть покупки та входьте в додатки за допомогою розпізнавання облич"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Розташуйте обличчя в колі"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Пізніше"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Можна додати максимум стільки облич: <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -1306,7 +1313,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Активація екрана"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Час показу"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Коли показувати"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нові сповіщення"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Активувати екран, коли надходять сповіщення"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Завжди ввімкнено"</string>
@@ -1696,7 +1703,7 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Під’єднайтеся до Інтернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Місцезнах.для робочого профілю"</string>
-    <string name="location_app_level_permissions" msgid="2777033567595680764">"Дозвіл додатка"</string>
+    <string name="location_app_level_permissions" msgid="2777033567595680764">"Дозвіл додаткам"</string>
     <string name="location_app_permission_summary_location_off" msgid="2790918244874943070">"Передавання геоданих вимкнено"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="5336807018727349708">
       <item quantity="one"> Кількість додатків із доступом до геоданих: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
@@ -1712,9 +1719,9 @@
     <string name="location_low_battery_use" msgid="8602232529541903596">"Низьке використання заряду"</string>
     <string name="location_scanning_screen_title" msgid="2297479353298444503">"Пошук Wi‑Fi та Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Шукати мережі Wi‑Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Дозволити додаткам і службам будь-коли шукати мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це може покращити роботу функцій і служб, які використовують геодані."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Дозволити додаткам і сервісам будь-коли шукати мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Шукати пристрої Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Дозволити додаткам і службам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і служб, які використовують геодані."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="managed_profile_location_services" msgid="4723268446874715222">"Служби локації для роботи"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Місцезнах. Wi-Fi і моб. мережі"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
@@ -2243,7 +2250,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Блакитний"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Жовтий"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпуровий"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Вашу відповідь не видно в Налаштуваннях, оскільки інший додаток загороджує запит на дозвіл."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Якщо ви ввімкнете службу <xliff:g id="SERVICE">%1$s</xliff:g>, дані на пристрої не захищатимуться екраном блокування."</string>
@@ -2252,8 +2260,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити PIN-код."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити пароль."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"Сервіс <xliff:g id="SERVICE">%1$s</xliff:g> просить повний доступ до цього пристрою. Він може переглядати вміст на екрані й виконувати дії від імені користувачів з особливими потребами. Такий рівень доступу не призначений для більшості додатків."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Зупинити <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Торкніться ОК, щоб зупинити <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Не встановлено жодної служби"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Службу не вибрано"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
@@ -2279,7 +2306,7 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додати принтери"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Увімк."</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Вимк."</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додати службу"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додати сервіс"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Додати принтер"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Пошук"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Пошук принтерів"</string>
@@ -2968,7 +2995,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Користувач"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профіль з обмеженням"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Додати нового користувача?"</string>
-    <string name="user_add_user_message_long" msgid="6768718238082929201">"Цим пристроєм можуть користуватися кілька людей. Для цього потрібно створити додаткові профілі. Власник профілю може налаштувати його на свій смак: вибрати фоновий малюнок, установити потрібні додатки тощо. Користувачі також можуть налаштовувати певні параметри пристрою (як-от Wi-Fi), які застосовуватимуться до решти профілів.\n\nПісля створення новий профіль потрібно налаштувати.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів. Налаштування спеціальних можливостей і служб можуть не передаватися новому користувачеві."</string>
+    <string name="user_add_user_message_long" msgid="6768718238082929201">"Цим пристроєм можуть користуватися кілька людей. Для цього потрібно створити додаткові профілі. Власник профілю може налаштувати його на свій смак: вибрати фоновий малюнок, установити потрібні додатки тощо. Користувачі також можуть налаштовувати певні параметри пристрою (як-от Wi-Fi), які застосовуватимуться до решти профілів.\n\nПісля створення новий профіль потрібно налаштувати.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів. Налаштування спеціальних можливостей і сервісів можуть не передаватися новому користувачеві."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Користувач має налаштувати свій профіль після створення.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Створити користувача зараз?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Переконайтеся, що користувач може взяти пристрій і налаштувати профіль"</string>
@@ -3239,7 +3266,7 @@
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Гучність дзвінка: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Гучність медіа"</string>
     <string name="remote_media_volume_option_title" msgid="7602586327091007461">"Гучність трансляції"</string>
-    <string name="call_volume_option_title" msgid="1265865226974255384">"Гучність виклику"</string>
+    <string name="call_volume_option_title" msgid="1265865226974255384">"Гучність розмови"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Гучність будильника"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Гучність дзвінка"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучність сповіщень"</string>
@@ -3252,7 +3279,7 @@
     <string name="other_sound_settings" msgid="3151004537006844718">"Інші звуки"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Звуки цифрової клавіатури"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звуки блокування екрана"</string>
-    <string name="charging_sounds_title" msgid="3379885700913955599">"Звук і вібрація (заряджання)"</string>
+    <string name="charging_sounds_title" msgid="3379885700913955599">"Звук і вібрація для заряджання"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Звуки вставлення в док-станцію"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Звуки під час дотику"</string>
     <string name="vibrate_on_touch_title" msgid="1510405818894719079">"Вібрація під час дотику"</string>
@@ -3283,11 +3310,11 @@
     <string name="zen_mode_behavior_total_silence" msgid="2229976744274214528">"Узагалі не турбувати"</string>
     <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звуку, винятки: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="6455884547877702466">"Без звуку, крім будильників і медіа"</string>
-    <string name="zen_mode_automation_settings_title" msgid="6155298704165984370">"Розклади"</string>
+    <string name="zen_mode_automation_settings_title" msgid="6155298704165984370">"Розклад"</string>
     <string name="zen_mode_delete_automatic_rules" msgid="5975522152123354381">"Видалити розклади"</string>
     <string name="zen_mode_schedule_delete" msgid="5717258786128155695">"Видалити"</string>
     <string name="zen_mode_rule_name_edit" msgid="812185626159430507">"Редагувати"</string>
-    <string name="zen_mode_automation_settings_page_title" msgid="8995524726286378583">"Розклади"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="8995524726286378583">"Розклад"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="4773111805919088437">"Розклад"</string>
     <string name="zen_mode_schedule_category_title" msgid="5482757877262584975">"Розклад"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Вимикати звук телефона в певний час"</string>
@@ -3307,7 +3334,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Коли надходитимуть сповіщення, телефон не подаватиме сигнал і не вібруватиме."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Вимкнути зображення та звук сповіщень"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Ви не зможете бачити або чути сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Ваш телефон не показуватиме нові або наявні сповіщення, не вібруватиме й не видаватиме звуки про них. Важливо! Критичні сповіщення про активність і статус телефона будуть з’являтися.\n\nПісля вимкнення режиму \"Не турбувати\" проведіть пальцем зверху вниз, щоб побачити пропущені сповіщення."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="1069960859746788356">"Ваш телефон не показуватиме нові або наявні сповіщення, не вібруватиме й не сигналізуватиме про них звуком. Зверніть увагу: критичні сповіщення про активність і статус телефона все одно з’являтимуться.\n\nКоли ви вимкнете режим \"Не турбувати\", проведіть пальцем вниз згори екрана, щоб побачити пропущені сповіщення."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Власні налаштування"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Увімкнути власне налаштування"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Видалити власне налаштування"</string>
@@ -3419,7 +3446,7 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"Дозволити значки сповіщень"</string>
     <string name="notification_bubbles_title" msgid="526545466417027926">"Спливаючі підказки"</string>
     <string name="notification_bubbles_summary" msgid="5269674863510678257">"Швидка взаємодія з додатками завдяки спливаючим ярликам"</string>
-    <string name="bubbles_feature_education" msgid="69923617148394578">"Деякі сповіщення та інший вміст можуть з’являться у вигляді спливаючих підказок на екрані. Щоб відкрити спливаючу підказку, натисніть її. Щоб сховати, перетягніть її вниз екрана."</string>
+    <string name="bubbles_feature_education" msgid="69923617148394578">"Деякі сповіщення та інший вміст можуть з’являтися у вигляді спливаючих підказок на екрані. Щоб відкрити спливаючу підказку, натисніть її, а щоб сховати – перетягніть вниз екрана."</string>
     <string name="bubbles_app_toggle_title" msgid="9143702245165359360">"Спливаючі підказки"</string>
     <string name="bubbles_app_toggle_summary" msgid="7714358008428342285">"Дозволити додатку <xliff:g id="APP_NAME">%1$s</xliff:g> показувати деякі сповіщення у вигляді спливаючих підказок"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="8013961655723563787">"Увімкнути спливаючі підказки"</string>
@@ -3430,7 +3457,7 @@
     <string name="swipe_direction_ltr" msgid="3623394320915041215">"Проведіть пальцем по екрану вправо, щоб закрити сповіщення, уліво – щоб показати меню"</string>
     <string name="swipe_direction_rtl" msgid="4972099509548044938">"Уліво – закрити сповіщення; управо – показати меню"</string>
     <string name="gentle_notifications_title" msgid="3976374971153475110">"Тихі сповіщення"</string>
-    <string name="gentle_notifications_also_display" msgid="6455360420411828133">"Параметри показу"</string>
+    <string name="gentle_notifications_also_display" msgid="6455360420411828133">"Де показувати"</string>
     <string name="gentle_notifications_display_status" msgid="2904115658980383410">"Рядок стану"</string>
     <string name="gentle_notifications_display_lock" msgid="1395567209329239992">"Заблокований екран"</string>
     <string name="gentle_notifications_education" msgid="8713358646047345762">"Тихі сповіщення завжди беззвучні й показуються на розкривній панелі"</string>
@@ -3580,8 +3607,8 @@
     <string name="zen_mode_rule_name_hint" msgid="278109122579468433">"Введіть назву розкладу"</string>
     <string name="zen_mode_rule_name_warning" msgid="3856485373110366912">"Назва розкладу вже використовується"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Додати ще"</string>
-    <string name="zen_mode_add_event_rule" msgid="4454759739839069898">"Додати в розклад подію"</string>
-    <string name="zen_mode_add_time_rule" msgid="7890557350868257760">"Додати в розклад час"</string>
+    <string name="zen_mode_add_event_rule" msgid="4454759739839069898">"Додати розклад для події"</string>
+    <string name="zen_mode_add_time_rule" msgid="7890557350868257760">"Додати розклад для часу"</string>
     <string name="zen_mode_delete_rule" msgid="8055032645990309096">"Видалити розклад"</string>
     <string name="zen_mode_choose_rule_type" msgid="40993242338494595">"Виберіть тип розкладу"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Видалити правило \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
@@ -3609,7 +3636,7 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Дні"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ніколи"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Щодня"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Сигнал може замінити час завершення"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Будильник може ігнорувати час завершення"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="1673667979187593693">"Розклад вимкнеться, коли задзвонить будильник"</string>
     <string name="zen_mode_custom_behavior_title" msgid="1148856394866360783">"Режим \"Не турбувати\""</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="7750128187766412708">"Використовувати налаштування за умовчанням"</string>
@@ -3621,7 +3648,7 @@
     <string name="zen_mode_calls" msgid="4769117032399813012">"Дозволити дзвінки"</string>
     <string name="zen_mode_calls_title" msgid="2905770092665685857">"Дзвінки"</string>
     <string name="zen_mode_calls_footer" msgid="2002070641802102110">"Щоб напевне дізнаватися про дозволені виклики, перевірте налаштований на телефоні режим (дзвінок, вібрація чи без звуку)."</string>
-    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"Вхідні виклики для сайту <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> блокуються. Ви можете змінити налаштування, щоб друзі, члени сім’ї й інші контакти зв’язувлися з вами."</string>
+    <string name="zen_mode_custom_calls_footer" msgid="4764756801941329281">"Вхідні виклики блокуються, коли активовано розклад \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Ви можете змінити налаштування, щоб потрібні люди могли зв’язатися з вами."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Позначені контакти"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
       <item quantity="one">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
@@ -3630,7 +3657,7 @@
       <item quantity="other">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
     </plurals>
     <string name="zen_mode_messages" msgid="6406892731721926170">"Дозволити повідомлення"</string>
-    <string name="zen_mode_messages_footer" msgid="2616568463646674149">"Щоб напевне дізнаватися про дозволені повідомлення, перевірте налаштований на телефоні режим (дзвінок, вібрація чи без звуку)."</string>
+    <string name="zen_mode_messages_footer" msgid="2616568463646674149">"Те, чи надходитимуть дозволені повідомлення зі звуком, залежить від вибраного на телефоні режиму (дзвінок, вібрація чи без звуку)."</string>
     <string name="zen_mode_custom_messages_footer" msgid="800067279796770040">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>: вхідні повідомлення блокуються. Ви можете змінити налаштування, щоб друзі, члени сім’ї й інші контакти зв’язувалися з вами."</string>
     <string name="zen_mode_messages_title" msgid="7325983674655986445">"SMS, MMS і додатки обміну повідомленнями"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Від усіх"</string>
@@ -4304,7 +4331,7 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Щоб перейти між додатками, проведіть пальцем угору на кнопці головного екрана. Щоб переглянути всі додатки, знову проведіть угору. Працює на будь-якому екрані. Кнопки \"Огляд\" у правому нижньому куті екрана більше не буде."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Спробуйте нову кнопку головного екрана"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Увімкніть новий жест, щоб переходити між додатками"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двічі торкніться, щоб перевірити телефон"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двічі торкнутися, щоб перевірити сповіщення"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двічі торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двічі торкніться, щоб перевірити пристрій"</string>
     <string name="ambient_display_summary" msgid="8534654210539169707">"Щоб перевірити час, сповіщення та іншу інформацію, двічі торкніться екрана."</string>
@@ -4473,8 +4500,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Оновити режим \"Не турбувати\""</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Призупинити сповіщення, щоб не відволікатися"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Ця функція недоступна"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Це сповільнить роботу телефона"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Увімкнути повне вимірювання GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Починати дії у фоновому режимі"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 9dfb2db..5cdc99b 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"چہرہ شامل کر دیا گیا"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"چہرے سے تصدیق کے سیٹ اپ کیلئے تھپتھپائیں"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"چہرے سے تصدیق"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"ایکسیسبیلٹی سیٹ اپ استعمال کریں"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"اپنے فون کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے اپنے چہرے کا استعمال کریں۔"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے چہرے کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا چہرا استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"اپنے فون کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے اپنے چہرے کا استعمال کریں"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"حلقے کے مرکز میں اپنا چہرہ رکھیں"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"اسے بعد میں کریں"</string>
     <string name="face_add_max" msgid="4408683751143942949">"آپ <xliff:g id="COUNT">%d</xliff:g> چہروں تک شامل کر سکتے ہیں"</string>
@@ -1868,7 +1875,7 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏SD کارڈ پر"</string>
     <string name="not_installed" msgid="2797554494953450291">"اس صارف کیلئے انسٹال نہیں ہے"</string>
     <string name="installed" msgid="3070865169422600098">"انسٹال کردہ"</string>
-    <string name="no_applications" msgid="7336588977497084921">"کوئی ایپس ہیں۔"</string>
+    <string name="no_applications" msgid="7336588977497084921">"کوئی ایپس نہیں ہیں۔"</string>
     <string name="internal_storage" msgid="1584700623164275282">"داخلی اسٹوریج"</string>
     <string name="recompute_size" msgid="7722567982831691718">"سائز کو دوبارہ شمار کر رہا ہے…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"ایپ کا ڈیٹا حذف کریں؟"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"سبزی مائل نیلا"</string>
     <string name="color_yellow" msgid="9112680561610873529">"پیلا"</string>
     <string name="color_magenta" msgid="5059212823607815549">"قرمزی"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> کو ضرورت ہے:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"چونکہ ایک ایپ اجازت کی درخواست کو مبہم کر رہی ہے، لہذا ترتیبات آپ کے جواب کی توثیق نہیں کر سکتی ہے۔"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر آپ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرتے ہیں تو آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"‏کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے PIN کی توثیق کرنے کی ضرورت ہے۔"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پاس ورڈ کی توثیق کرنے کی ضرورت ہے۔"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> نے اس آلہ پر مکمل کنٹرول کی درخواست کی ہے۔ یہ سروس اسکرین کو پڑھ سکتی ہے اور مع ایکسیسبیلٹی کی ضروریات کے صارفین کے جانب سے کارروائی کر سکتی ہے۔ زیادہ تر اپپس کے لیے اس لیول کا کنٹرول مناسب نہیں ہے۔"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> روکیں؟"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"ٹھیک ہے تھپتھپانے سے <xliff:g id="SERVICE">%1$s</xliff:g> رک جائے گی۔"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"کوئی سروسز انسٹال کردہ نہيں ہیں"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"کوئی سروس منتخب نہیں ہے"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"کوئی تفصیل فراہم نہيں کی گئی۔"</string>
@@ -2240,7 +2267,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"اس پرنٹر کے بارے میں مزید معلومات"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"بیٹری"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"کیا بیٹری استعمال کرتا رہا ہے"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"بیٹری استعمال ڈیٹا دستیاب نہیں۔"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"بیٹری کے استعمال کا ڈیٹا دستیاب نہیں۔"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> باقی"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> چارج کرنے کیلئے"</string>
@@ -2932,7 +2959,7 @@
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"پابندیوں والی ایپلیکیشنز"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ایپ کیلئے ترتیبات پھیلائیں"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"‏تھپتھپائیں ‎اور‎ ادائیگی کریں"</string>
-    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"یہ کیسے کام کرتی ہے"</string>
+    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"یہ کیسے کام کرتا ہے"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"اسٹورز میں اپنے فون سے ادائیگی کریں"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"ڈیفالٹ ادائیگی"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"سیٹ نہیں ہے"</string>
@@ -4312,8 +4339,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ڈسٹرب نہ کریں\' کو اپ ڈیٹ کریں"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"متوجہ رہنے کے لیے اطلاعات موقوف کریں"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"یہ خصوصیت دستیاب نہیں ہے"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"اس سے فون کی رفتار سست ہوجائے گی"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‏ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"پس منظر کی سرگرمی شروع ہونے دیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7bc1851..3c17beb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Yuz kiritildi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Yuz tekshiruvini sozlash uchun bosing"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Yuz tekshiruvi"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Maxsus imkoniyatlarni sozlash"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun yuzingizdan foydalaning."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: barmoq izi orqali bu qurilmani qulfdan chiqara olmaysiz. Batafsil axborot olish uchun tashkilot administratoriga murojaat qiling."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun yuzingizdan foydalaning"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Yuzingizni aylana markaziga moslang"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Keyinroq"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Maksimal <xliff:g id="COUNT">%d</xliff:g> ta yuzni kiritish mumkin"</string>
@@ -1721,7 +1728,7 @@
     <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"Xavfsizlik uchun parol o‘rnating"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmoq izidan foydalanish uchun parol o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun avval grafik kalit tayinlang"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"PIN kod tayinlang"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"PIN kod yarating"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"Grafik kalit yarating"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolni qayta kiriting"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Moviy"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Sariq"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Pushtirang"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ilova ruxsatnoma so‘roviga xalaqit qilayotgani tufayli, “Sozlamalar” ilovasi javobingizni tekshira olmaydi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Agar <xliff:g id="SERVICE">%1$s</xliff:g> xizmatini yoqsangiz, qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois PIN-kodingizni tasdiqlashingiz lozim."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois parolingizni tasdiqlashingiz lozim."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> bu qurilmaning toʻliq boshqaruvini talab qilmoqda. Xizmat ekrandagilarni oʻqishi va maxsus imkoniyatlarga ehtiyoji bor foydalanuvchilar nomidan harakat qilishi mumkin. Boshqaruvning bu darajasi ayrim ilovalargagina mos keladi."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> xizmati to‘xtatilsinmi?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"<xliff:g id="SERVICE">%1$s</xliff:g> xizmatini to‘xtatish uchun OK tugmasini bosing."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hech qanday xizmat o‘rnatilmagan"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Hech qanday xizmat tanlanmagan"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hech qanday tavsif berilmagan."</string>
@@ -2251,7 +2278,7 @@
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Fonda ishlashi cheklansinmi?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
     <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Bu ilova batareya sarfini optimallashtirish uchun sozlanmagani sababli uni cheklash imkonsiz.\n\nIlovani cheklash uchun avval batareya sarfini optimallashtirish funksiyasini yoqing."</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Toʻliq quvvat olganidan beri ekrandan foydalanish"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Toʻliq quvvatlanganidan beri ekrandan foydalanish"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
     <skip />
@@ -2446,9 +2473,7 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_detail_since_full_charge (7515347842046955855) -->
     <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_last_full_charge (7151251641099019361) -->
-    <skip />
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Oxirgi toʻliq quvvatlanish"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_full_charge_last (8892335687734288031) -->
     <skip />
@@ -2478,9 +2503,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="3653601117764171846">"<xliff:g id="PERCENT">%1$s</xliff:g> quvvat qolganda yoqiladi"</string>
     <string name="battery_saver_schedule_settings_title" msgid="6000660866895036589">"Jadval tuzish"</string>
     <string name="battery_saver_turn_on_summary" msgid="5552800757174173459">"Batareya quvvati sarfini uzaytirish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_sticky_title_new (613272902035943099) -->
-    <skip />
+    <string name="battery_saver_sticky_title_new" msgid="613272902035943099">"Toʻliq quvvatlanganda faolsizlantirish"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6659545534053937371">"Telefon quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6537930800784858686">"Planshet quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="8309483774864505603">"Qurilma quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
@@ -2782,8 +2805,8 @@
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec serveri sertifikati"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Kengaytirilgan sozlamalar"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS qidiruvi uchun domenlar"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-serverlar (m-n, 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"Uzatish yo‘laklari (m-n, 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS serverlar (m-n, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Uzatish marshrutlari (m-n, 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Foydalanuvchi nomi"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Parol"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Hisob ma’lumotini saqlash"</string>
@@ -4332,8 +4355,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Bezovta qilinmasin rejimini yoqing"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Bezovta qiluvchi bildirishnomalarni pauza qiling"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Bu funksiya ishlamaydi"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Bunda telefon sekinlashi mumkin"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Butun GNSS statistikasini yuklash"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Orqa fonda ishga tushirishga ruxsat berish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4016b65..a7c1e7f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Đã thêm khuôn mặt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Nhấn để thiết lập xác thực khuôn mặt"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Xác thực khuôn mặt"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Sử dụng thiết lập hỗ trợ tiếp cận"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại, ủy quyền các giao dịch mua hoặc đăng nhập vào các ứng dụng."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Bạn không thể sử dụng khuôn mặt của mình để mở khóa thiết bị này. Để biết thêm thông tin, hãy liên hệ với quản trị viên của tổ chức bạn."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại, ủy quyền các giao dịch mua hoặc đăng nhập vào các ứng dụng"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Căn giữa khuôn mặt trong hình tròn"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Thực hiện sau"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Bạn có thể thêm tới <xliff:g id="COUNT">%d</xliff:g> khuôn mặt"</string>
@@ -1254,10 +1261,10 @@
     <string name="style_suggestion_title" msgid="4710867417147087928">"Tùy chỉnh Pixel của bạn"</string>
     <string name="style_suggestion_summary" msgid="4592087484229499188">"Hãy thử kiểu, hình nền, đồng hồ và các tùy chọn khác"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Trình bảo vệ màn hình"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Khi sạc hoặc gắn đế"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Khi sạc hoặc gắn vào đế sạc"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Khi gắn đế và sạc"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi gắn đế"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi gắn vào đế sạc"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Không bao giờ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật trình bảo vệ màn hình."</string>
@@ -1346,7 +1353,7 @@
     <string name="status_number_sim_slot" product="default" msgid="1898212200138025729">"Số điện thoại (khe SIM %1$d)"</string>
     <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN trên SIM"</string>
     <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Số điện thoại trên SIM"</string>
-    <string name="status_min_number" msgid="3519504522179420597">"TỐI THIỂU"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"Phiên bản PRL"</string>
     <string name="meid_multi_sim" msgid="748999971744491771">"MEID (khe cắm thẻ SIM %1$d)"</string>
@@ -1584,7 +1591,7 @@
     <string name="reset_esim_desc" msgid="5940105242448544634">"Nếu bạn muốn tải SIM thay thế xuống, hãy liên hệ với nhà mạng. Thao tác này sẽ không hủy bất kỳ gói dịch vụ di động nào."</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Đặt lại các tùy chọn cài đặt"</string>
     <string name="reset_network_final_desc" msgid="4690205209934596665">"Bạn muốn đặt lại tất cả tùy chọn cài đặt mạng? Bạn không thể hủy hành động này."</string>
-    <string name="reset_network_final_desc_esim" msgid="6641433458865914227">"Bạn muốn đặt lại tất cả tùy chọn cài đặt mạng và xóa các SIM đã tải xuống? Bạn không thể hủy hành động này."</string>
+    <string name="reset_network_final_desc_esim" msgid="6641433458865914227">"Bạn muốn đặt lại tất cả tùy chọn cài đặt mạng và xóa các SIM đã tải xuống? Bạn không thể hủy hành động này sau khi đã thực hiện."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Đặt lại các tùy chọn cài đặt"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Đặt lại?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Đặt lại mạng không khả dụng cho người dùng này"</string>
@@ -1594,7 +1601,7 @@
     <string name="master_clear_title" msgid="3531267871084279512">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
     <string name="master_clear_short_title" msgid="8652450915870274285">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
     <string name="master_clear_desc" product="tablet" msgid="2314458161059569301">"Hành động này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm cả:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_desc" product="default" msgid="7647628092266675099">"Hành động này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>", của điện thoại, bao gồm cả:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_desc" product="default" msgid="7647628092266675099">"Hành động này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm cả:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
@@ -1978,7 +1985,7 @@
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Bàn phím ảo khả dụng"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Quản lý bàn phím"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Trợ giúp về bàn phím"</string>
-    <string name="physical_keyboard_title" msgid="8285149877925752042">"Bàn phím  vật lý"</string>
+    <string name="physical_keyboard_title" msgid="8285149877925752042">"Bàn phím vật lý"</string>
     <string name="show_ime" msgid="2658582193437188227">"Hiển thị bàn phím ảo"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Hiển thị bàn phím ảo trên màn hình trong khi bàn phím vật lý đang hoạt động"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Trình trợ giúp về phím tắt"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"Lục lam"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Vàng"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Đỏ tươi"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Vì ứng dụng đang che khuất yêu cầu cấp quyền, Cài đặt không thể xác minh câu trả lời của bạn."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nếu bạn bật <xliff:g id="SERVICE">%1$s</xliff:g>, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hướng đến mã hóa dữ liệu, bạn cần phải xác nhận mã PIN của mình."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận mật khẩu của mình."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> đang yêu cầu toàn quyền kiểm soát thiết bị này. Dịch vụ này có thể đọc màn hình và hành động thay mặt cho người dùng có nhu cầu về hỗ trợ tiếp cận. Mức độ kiểm soát này không phù hợp với hầu hết các ứng dụng."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Dừng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Nhấn OK sẽ dừng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Không có dịch vụ nào được chọn"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
@@ -2522,7 +2549,7 @@
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Dịch vụ nhập bằng giọng nói này có thể thực hiện theo dõi bằng giọng nói luôn bật và kiểm soát các ứng dụng hỗ trợ giọng nói thay mặt cho bạn. Dịch vụ này đến từ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Cho phép sử dụng dịch vụ này?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Công cụ ưu tiên"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Cài đặt công cụ"</string>
-    <string name="tts_sliders_title" msgid="992059150784095263">"Tốc độ giọng nói và cao độ"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"Tốc độ lời nói và cao độ"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Công cụ"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Giọng nói"</string>
     <string name="tts_spoken_language" msgid="5542499183472504027">"Ngôn ngữ nói"</string>
@@ -3381,13 +3408,13 @@
     <string name="notification_alert_title" msgid="7426286507434650473">"Ưu tiên"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Cho phép gián đoạn"</string>
     <string name="allow_interruption_summary" msgid="7870159391333957050">"Cho phép ứng dụng phát ra âm thanh, rung và/hoặc hiển thị thông báo trên màn hình"</string>
-    <string name="notification_channel_summary_min" msgid="2965790706738495761">"Trong danh sách kéo xuống, hãy thu gọn thông báo thành một dòng"</string>
+    <string name="notification_channel_summary_min" msgid="2965790706738495761">"Thu gọn thông báo thành một dòng trong danh sách kéo xuống"</string>
     <string name="notification_channel_summary_low" msgid="7875385321253491191">"Giúp bạn chỉ tập trung vào thông báo trong danh sách kéo xuống. Luôn im lặng."</string>
     <string name="notification_channel_summary_low_status" msgid="7866565328564018007">"Hiển thị bên dưới thông báo mức độ ưu tiên. Luôn im lặng."</string>
     <string name="notification_channel_summary_low_lock" msgid="4009247523075328235">"Hiển thị bên dưới thông báo mức độ ưu tiên. Luôn im lặng."</string>
     <string name="notification_channel_summary_low_status_lock" msgid="3668028634045057230">"Hiển thị bên dưới thông báo mức độ ưu tiên. Luôn im lặng."</string>
     <string name="notification_channel_summary_default" msgid="4618537204284469990">"Thu hút sự chú ý của bạn bằng biểu tượng thanh trạng thái và âm thanh. Hiển thị trên màn hình khóa."</string>
-    <string name="notification_channel_summary_high" msgid="7737315941884569891">"Khi thiết bị đang mở khóa, hãy hiển thị thông báo dưới dạng biểu ngữ ở đầu màn hình"</string>
+    <string name="notification_channel_summary_high" msgid="7737315941884569891">"Hiển thị thông báo ở đầu màn hình khi thiết bị đang mở khóa"</string>
     <string name="notification_switch_label" msgid="6843075654538931025">"Hiển thị thông báo"</string>
     <string name="default_notification_assistant" msgid="8441022088918117445">"Thông báo thích ứng"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="6049014219388148161">
@@ -3904,7 +3931,7 @@
     <string name="display_dashboard_summary_with_style" msgid="870920274423314524">"Kiểu, hình nền, thời gian chờ khóa màn hình, cỡ chữ"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="7840559323355210111">"Ngủ, cỡ chữ"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Chuyển sang chế độ ngủ sau 10 phút không hoạt động"</string>
-    <string name="memory_summary" msgid="8080825904671961872">"Trung bình <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> bộ nhớ được sử dụng"</string>
+    <string name="memory_summary" msgid="8080825904671961872">"Đã dùng khoảng <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Đã đăng nhập với tên <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> là mặc định"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Đã tắt sao lưu"</string>
@@ -4291,7 +4318,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Dịch vụ tự động điền"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"tự động, điền, tự động điền"</string>
-    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng nội dung trên màn hình của bạn để xác định nội dung nào có thể được tự động điền."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng thông tin trên màn hình để xác định nội dung nào có thể được tự động điền."</string>
     <string name="debug_autofill_category" msgid="8050326960545979035">"Tự động điền"</string>
     <string name="autofill_logging_level_title" msgid="899483289251346778">"Mức ghi nhật ký"</string>
     <string name="autofill_max_partitions" msgid="7590272120101271461">"Số yêu cầu tối đa trong mỗi phiên hoạt động"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Cập nhật chế độ Không làm phiền"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Tạm dừng thông báo để tập trung"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Không sử dụng được tính năng này trên thiết bị này"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Tính năng này chưa được cung cấp"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Tính năng này sẽ làm giảm tốc độ điện thoại"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Thực thi số đo GNSS đầy đủ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Theo dõi tất cả chòm sao và tần suất GNSS mà không có chu kỳ làm việc"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Cho phép các lượt bắt đầu hoạt động trong nền"</string>
@@ -4481,7 +4510,7 @@
     <string name="mobile_network_mode_error" msgid="4784347953600013818">"Chế độ mạng <xliff:g id="NETWORKMODEID">%1$d</xliff:g> không hợp lệ. Bỏ qua."</string>
     <string name="mobile_network_apn_title" msgid="7610812642954395440">"Tên điểm truy cập"</string>
     <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="emergency_info_contextual_card_summary" msgid="7993926837251874514">"Thông tin y tế, người liên hệ khẩn cấp"</string>
+    <string name="emergency_info_contextual_card_summary" msgid="7993926837251874514">"Thông tin y tế, người liên hệ lúc khẩn cấp"</string>
     <string name="see_more" msgid="5953815986207345223">"Xem thêm"</string>
     <string name="see_less" msgid="1250265310929558370">"Xem bớt"</string>
     <string name="network_connection_request_dialog_title" msgid="3502355504717957803">"Thiết bị sẽ sử dụng với <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d168451..37d8c1b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已添加面孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"点按即可设置面孔身份验证"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"面孔身份验证"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"使用无障碍设置"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"通过您的面孔解锁手机、授权购买交易或登录应用。"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"请使用您的面孔解锁手机或批准购买交易。\n\n注意：您无法使用面孔来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用您的面孔解锁手机、授权购买交易或登录应用"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"让您的面孔位于圆圈的中心位置"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"以后再说"</string>
     <string name="face_add_max" msgid="4408683751143942949">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个面孔"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"青色"</string>
     <string name="color_yellow" msgid="9112680561610873529">"黄色"</string>
     <string name="color_magenta" msgid="5059212823607815549">"紫红色"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"要使用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"“<xliff:g id="SERVICE">%1$s</xliff:g>”需要："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"由于某个应用遮挡了权限请求界面，因此“设置”应用无法验证您的回应。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启 <xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密，因此您需要确认您的 PIN 码。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密，因此您需要确认您的密码。"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>正在请求完全控制此设备。该服务可以读取屏幕内容，并代表有无障碍需求的用户进行操作。这种控制级别不适合大多数应用。"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"要停用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"点按“确定”将会停用“<xliff:g id="SERVICE">%1$s</xliff:g>”。"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"未选择任何服务"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新勿扰模式"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"暂停通知即可保持专注"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"该设备不支持此功能"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"此功能不可用"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"这会降低这部手机的速度"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"强制启用 GNSS 测量结果全面跟踪"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作周期的情况下跟踪所有 GNSS 星座和频率"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"允许系统执行后台活动"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e8ac0d9..1015c00 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已加入臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"輕按即可設定臉孔驗證"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"臉孔驗證"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"使用無障礙功能設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"使用臉孔解鎖手機、授權購物或登入應用程式。"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"使用臉孔解鎖手機或核准購物交易。\n\n請注意：您無法使用臉孔解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用臉孔解鎖手機、授權購物或登入應用程式"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"將您的臉孔置於圓圈中心"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"稍後再註冊"</string>
     <string name="face_add_max" msgid="4408683751143942949">"您可以加入最多 <xliff:g id="COUNT">%d</xliff:g> 張臉孔"</string>
@@ -913,7 +920,7 @@
     <string name="wifi_hidden_network_warning" msgid="6674068093531603452">"如果您的路由器沒有廣播網絡 ID，但日後想連線至該網絡，您可以將網絡設為隱藏。\n\n由於您的手機會定期廣播訊號以尋找網絡，因此可能會產生安全風險。\n\n將網絡設為隱藏並不會變更您的路由器設定。"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"訊號強度"</string>
     <string name="wifi_status" msgid="4824568012414605414">"狀態"</string>
-    <string name="tx_wifi_speed" msgid="2994278184097786511">"傳輸連結的速度"</string>
+    <string name="tx_wifi_speed" msgid="2994278184097786511">"傳輸連結速度"</string>
     <string name="rx_wifi_speed" msgid="7206089638282839236">"接收連結的速度"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"頻率"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string>
@@ -940,7 +947,7 @@
     <string name="wifi_privacy_settings" msgid="5500777170960315928">"私隱"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="1539659414108891004">"隨機化處理 MAC"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8674936581557695411">"新增裝置"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"將二維條碼置於下方中間，即可將裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
+    <string name="wifi_dpp_center_qr_code" msgid="6244508369721032655">"相機對準以下二維條碼，即可將裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="4794621158747044107">"掃瞄二維條碼"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="4371771604088014396">"將二維條碼置於下方中間，即可連接至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="8096370383700478819">"掃瞄二維條碼以加入 Wi-Fi"</string>
@@ -969,7 +976,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4938294574591503213">"Wi-Fi 密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"熱點密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="4072206063308645677">"新增裝置"</string>
-    <string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"使用二維條碼，即可新增裝置到此網絡"</string>
+    <string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"使用二維條碼在此網絡新增裝置"</string>
     <string name="retry" msgid="6472609612090877557">"重試"</string>
     <string name="wifi_shared" msgid="844142443226926070">"與其他裝置使用者分享"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
@@ -1036,7 +1043,7 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
     <string name="wifi_details_title" msgid="8954667664081737098">"網絡詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網絡遮罩"</string>
-    <string name="wifi_details_dns" msgid="8648826607751830768">"網域名稱系統 (DNS)"</string>
+    <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"已儲存的網絡"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="6480224551765489055">"訂閱"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"洋青色"</string>
     <string name="color_yellow" msgid="9112680561610873529">"黃色"</string>
     <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"由於有應用程式阻礙權限請求，「設定」無法驗證您的回覆。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟<xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度，因此您需要確認 PIN。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度，因此您需要確認密碼。"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g>正在要求完全控制此裝置。此服務可以讀取畫面，並代表需要使用無障礙功能的使用者執行動作。這種程度的控制不適用於大部分應用程式。"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"輕按 [確定] 後，<xliff:g id="SERVICE">%1$s</xliff:g> 便會停止。"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"未選取任何服務"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
@@ -2251,7 +2278,7 @@
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</string>
     <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由於此應用程式並未設定為優化電池，您無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕使用時間"</string>
     <string name="power_usage_list_summary" msgid="5584049564906462506">"完全充電後的電池用量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充滿電後的螢幕開啟時間"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充滿電後的裝置用量"</string>
@@ -2328,12 +2355,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"此應用程式會在背景使用電量。您的電池電量可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"您的應用程式目前的耗電量正常。如果應用程式耗電過多，手機會建議您進行一些操作。\n\n如果電量不足，您隨時都可以開啟「電量延長」。"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"您的應用程式目前的耗電量正常。如果應用程式耗電過多，手機會建議您進行一些操作。\n\n如果電量不足，您隨時都可以開啟「省電模式」。"</string>
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"您的應用程式目前的耗電量正常。如果應用程式耗電過多，平板電腦將會為您提供操作建議。\n\n如果電量較低，您可以隨時開啟省電模式。"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"您的應用程式目前的耗電量正常。如果應用程式耗電過多，裝置將會為您提供操作建議。\n\n如果電量較低，您可以隨時開啟省電模式。"</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"電池管理工具"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"自動管理應用程式"</string>
-    <string name="smart_battery_summary" msgid="1339184602000004058">"為不常用的應用程式限制用電量"</string>
+    <string name="smart_battery_summary" msgid="1339184602000004058">"限制不常用應用程式的耗電量"</string>
     <string name="smart_battery_footer" product="default" msgid="5555604955956219544">"當「電池管理工具」偵測到應用程式正在耗電時，您可選擇限制這些應用程式。受限制的應用程式可能會因此無法正常運作，且相關通知可能會延遲。"</string>
     <string name="smart_battery_footer" product="tablet" msgid="5555604955956219544">"當「電池管理工具」偵測到應用程式正在耗電時，您可選擇限制這些應用程式。受限制的應用程式可能會因此無法正常運作，且相關通知可能會延遲。"</string>
     <string name="smart_battery_footer" product="device" msgid="5555604955956219544">"當「電池管理工具」偵測到應用程式正在耗電時，您可選擇限制這些應用程式。受限制的應用程式可能會因此無法正常運作，且相關通知可能會延遲。"</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新請勿騷擾模式"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知，助您保持專注"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這部裝置不支援此功能"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"無法使用此功能"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"此功能會減慢這部手機的運作速度"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"強制啟用完整的 GNSS 測量資料"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"允許啟動背景活動"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e903d96..36f61fe 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已新增臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"輕觸即可設定臉孔驗證"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"臉孔驗證"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"使用協助工具設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"使用你的臉孔將手機解鎖、授權購物交易或登入應用程式。"</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"使用你的臉孔將手機解鎖或核准購物交易。\n\n注意：你無法使用臉孔將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用你的臉孔將手機解鎖、授權購物交易或登入應用程式"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"請將你的臉孔對準圓圈中心"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"稍後再說"</string>
     <string name="face_add_max" msgid="4408683751143942949">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個臉孔"</string>
@@ -2187,7 +2194,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"青色"</string>
     <string name="color_yellow" msgid="9112680561610873529">"黃色"</string>
     <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證你的回應。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果你開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，你的裝置將無法使用螢幕鎖定加強資料加密。"</string>
@@ -2196,8 +2204,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須輸入 PIN。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須輸入密碼。"</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> 要求這個裝置的完整控制權。如果你授予相關權限，該服務就能讀取畫面內容及執行動作，以協助需要無障礙服務的使用者。這個等級的控制權不適用於大多數應用程式。"</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"輕觸 [確定] 會讓「<xliff:g id="SERVICE">%1$s</xliff:g>」停止運作。"</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"未選取任何服務"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
@@ -4313,8 +4340,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新「零打擾」模式"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知以保持專注"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"無法使用這項功能"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"這會減慢這支手機的速度"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"強制啟用完整的 GNSS 測量資料"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"允許系統執行背景活動"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 27b8a23..8b3be32 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -399,6 +399,11 @@
     <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ubuso bungeziwe"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Thepha ukuze usethe ukufakazela ubuqiniso bobuso"</string>
     <string name="security_settings_face_preference_title" msgid="7074548721778680481">"Ukufakazela ubuqiniso bobuso"</string>
+    <!-- no translation found for security_settings_face_enroll_education_title (2695443729648587731) -->
+    <skip />
+    <!-- no translation found for security_settings_face_enroll_education_title_unlock_disabled (4697363240703556987) -->
+    <skip />
+    <string name="security_settings_face_enroll_education_message" msgid="4401918487764636333"></string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="7784083491315229721">"Sebenzisa ukusetha kokufinyelela"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="5924018301323255439"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="4455532390587307262"></string>
@@ -409,7 +414,9 @@
     <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho noma uvumele ukuthengwa.\n\nQaphela: Awukwazi ukusebenzisa ifoni yakho ukuze uvule le divayisi. Ukuze uthole olunye ulwazi, xhumana nomphathi wenhlangano yakho."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza"</string>
-    <string name="security_settings_face_enroll_introduction_footer_message" msgid="6129862379306304035"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_1" msgid="5594630288374571903"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_2" msgid="7576241712527601978"></string>
+    <string name="security_settings_face_enroll_introduction_footer_part_3" msgid="7355240941877607603"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Faka phakathi kwendawo ubuso bakho kundingiliza"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Yenza emuva kwesikhathi"</string>
     <string name="face_add_max" msgid="4408683751143942949">"Ungangeza kufikela kubuso obungu-<xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -2188,7 +2195,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"I-Cyan"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Okuliphuzi"</string>
     <string name="color_magenta" msgid="5059212823607815549">"I-Magenta"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <!-- no translation found for enable_service_title (1374048678465697350) -->
+    <skip />
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ngoba uhlelo lokusebenza lusitha isicelo semvume, Izilungiselelo azikwazi ukuqinisekisa impendulo yakho."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Uma uvula i-<xliff:g id="SERVICE">%1$s</xliff:g>, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini sakho ukuthuthukisa ukubethelwa kwedatha."</string>
@@ -2197,8 +2205,27 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphinikhodi yakho."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphasiwedi yakho."</string>
     <string name="accessibility_service_warning" msgid="846312597054899472">"<xliff:g id="SERVICE">%1$s</xliff:g> icela ukulawula okuphelele kwale divayisi. Isevisi ingafunda isikrini futhi isebenze engxenyeni yabasebenzisi abanezidingo zokufinyelela. Le leveli yokulawula ayiqondile kuzinhlelo zokusebenza eziningi."</string>
+    <!-- no translation found for accessibility_service_warning_description (5678294638592090340) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_title (1262218781398117580) -->
+    <skip />
+    <!-- no translation found for accessibility_service_screen_control_description (5263900135083661468) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_title (5228338448018587344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_action_perform_description (2402904134246069476) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_allow (8427955451281232788) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_deny (4307331121783796869) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_stop (7861331860214808622) -->
+    <skip />
+    <!-- no translation found for accessibility_dialog_button_cancel (5006357240387387028) -->
+    <skip />
     <string name="disable_service_title" msgid="3624005212728512896">"Misa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Ukuthepha KULUNGILE kuzomisa i-<xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <!-- no translation found for disable_service_message (4593387199926310801) -->
+    <skip />
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ayikho isevisi efakiwe"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Ayikho isevisi ekhethiwe"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
@@ -4314,8 +4341,10 @@
     <string name="zen_suggestion_title" msgid="798067603460192693">"Buyekeza okuthi ungaphazamisi"</string>
     <string name="zen_suggestion_summary" msgid="5928686804697233014">"Misa isikhashana izikhangiso ukuze uhlale ugxilile"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
-    <string name="disabled_feature" msgid="2102058661071271076">"Lesi sici asitholakali"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="6377125503096655882">"Izokwehlisa le foni"</string>
+    <!-- no translation found for disabled_feature (3232554901854971743) -->
+    <skip />
+    <!-- no translation found for disabled_feature_reason_slow_down_phone (3557117039415422481) -->
+    <skip />
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Phoqa izikali ezigcwele ze-GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
     <string name="allow_background_activity_starts" msgid="4121456477541603005">"Vumela ukuqala komsebenzi ongemuva"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ffe0aa5..9ac9110 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -675,15 +675,6 @@
     </string-array>
 
     <!-- Keys for the list of accessibility timeouts xml. -->
-    <string-array name="accessibility_timeout_content_selector_keys" translatable="false">
-        <item>accessibility_content_timeout_default</item>
-        <item>accessibility_content_timeout_10secs</item>
-        <item>accessibility_content_timeout_30secs</item>
-        <item>accessibility_content_timeout_1min</item>
-        <item>accessibility_content_timeout_2mins</item>
-    </string-array>
-
-    <!-- Keys for the list of accessibility timeouts xml. -->
     <string-array name="accessibility_timeout_control_selector_keys" translatable="false">
         <item>accessibility_control_timeout_default</item>
         <item>accessibility_control_timeout_10secs</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b24912..54a39e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -890,10 +890,14 @@
     <string name="security_settings_face_preference_title">Face authentication</string>
     <!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->
     <string name="security_settings_face_enroll_education_title">How to set up Face unlock</string>
-    <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->
+    <!-- Introduction title shown in face enrollment education screen for accessibility [CHAR LIMI=40]-->
+    <string name="security_settings_face_enroll_education_title_accessibility">Set up Face unlock</string>
+    <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
     <string name="security_settings_face_enroll_education_title_unlock_disabled">Use your face to authenticate</string>
     <!-- Introduction detail message shown in face education [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_enroll_education_message"></string>
+    <!-- Button that takes the user to the enrollment activity [CHAR LIMIT=20] -->
+    <string name="security_settings_face_enroll_education_start">Start</string>
     <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->
     <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>
     <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->
@@ -906,7 +910,7 @@
     <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>
     <!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->
     <string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>
-    <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->
+    <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Use your face to authenticate</string>
     <!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>
@@ -923,7 +927,7 @@
     <!-- Title shown in face enrollment dialog [CHAR LIMIT=40] -->
     <string name="security_settings_face_enroll_repeat_title">Center your face in the circle</string>
     <!-- Button text to skip enrollment of face [CHAR LIMIT=40] -->
-    <string name="security_settings_face_enroll_enrolling_skip">Do it later</string>
+    <string name="security_settings_face_enroll_enrolling_skip">Skip</string>
     <!-- Text shown when "Add face" button is disabled -->
     <string name="face_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> faces</string>
     <!-- Text shown when users has enrolled a maximum number of faces [CHAR LIMIT=NONE] -->
@@ -3847,6 +3851,13 @@
     <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
     <string name="mobile_connect_to_internet" translatable="true">Please connect to the internet</string>
 
+    <!-- Location settings screen, sub category for recent location requests [CHAR LIMIT=42] -->
+    <string name="location_category_recent_location_requests">Recent location requests</string>
+    <!-- Location settings screen, displayed when there're more than three recent location requests [CHAR LIMIT=30] -->
+    <string name="location_recent_location_requests_see_all">See all</string>
+    <!-- Location settings screen, sub category for location services [CHAR LIMIT=30] -->
+    <string name="location_category_location_services">Location services</string>
+
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
     <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
@@ -4806,7 +4817,7 @@
     <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
     <string name="interaction_control_category_title">Interaction controls</string>
     <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
-    <string name="user_installed_services_category_title">Downloaded services</string>
+    <string name="user_installed_services_category_title">Downloaded apps</string>
     <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->
     <string name="experimental_category_title">Experimental</string>
     <!-- Title for feature flags dashboard where developers can turn on experimental features [CHAR LIMIT=50] -->
@@ -4882,12 +4893,10 @@
     <string name="accessibility_timeout_1min">1 minute</string>
     <!-- Option heading to leave the timeout requirement for accessibility users at 2 mins. [CHAR LIMIT=35] -->
     <string name="accessibility_timeout_2mins">2 minutes</string>
-    <!-- Title for accessibility preference to accessibility timeout. [CHAR LIMIT=35] -->
-    <string name="accessibility_content_timeout_preference_title">Time to read</string>
+    <!-- Title for accessibility settings timeout item. [CHAR LIMIT=43] -->
+    <string name="accessibility_setting_item_control_timeout_title">Time to take action (Accessibility timeout)</string>
     <!-- Title for accessibility preference to accessibility timeout. [CHAR LIMIT=35] -->
     <string name="accessibility_control_timeout_preference_title">Time to take action</string>
-    <!-- Descriptive text for accessibility preference to accessibility content timeout. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_content_timeout_preference_summary">Choose how long to show messages that you need to read, but are visible only temporarily.\n\nNot all apps support this setting.</string>
     <!-- Descriptive text for accessibility preference to accessibility control timeout. [CHAR LIMIT=NONE] -->
     <string name="accessibility_control_timeout_preference_summary">Choose how long to show messages that ask you to take action, but are visible only temporarily.\n\nNot all apps support this setting.</string>
 
@@ -4912,7 +4921,7 @@
     <!-- Title for accessibility preference for configuring touch feedback vibrations. -->
     <string name="accessibility_touch_vibration_title">Touch feedback</string>
     <!-- Used in the acessibilty service settings to control turning on/off the service entirely -->
-    <string name="accessibility_service_master_switch_title">Use service</string>
+    <string name="accessibility_service_master_switch_title">Use <xliff:g id="service" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
     <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
     <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->
@@ -5138,7 +5147,7 @@
     </string>
 
     <!-- Title for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_action_perform_title">View and platform actions</string>
+    <string name="accessibility_service_action_perform_title">View and perform actions</string>
 
     <!-- Description for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_action_perform_description">It can track your interactions
@@ -7059,6 +7068,18 @@
     <string name="mms_message_title">MMS messages</string>
     <!-- Summary of multimedia messaging service settings.  [CHAR LIMIT=100] -->
     <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>
+
+    <!-- Title of a preference for whether to allow data during calls that is shown when mobile
+         data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is
+         default for data might not be available during a phone call. [CHAR LIMIT=60] -->
+    <string name="data_during_calls_title">Data during calls</string>
+    <!-- Title of a preference for whether to allow data during calls that is shown when mobile
+         data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is
+         default for data might not be available during a phone call. [CHAR LIMIT=NONE] -->
+    <string name="data_during_calls_summary">
+        Allow this SIM to be used for mobile data only during calls
+    </string>
+
     <!-- Work SIM title.  [CHAR LIMIT=50] -->
     <string name="work_sim_title">Work SIM</string>
 
@@ -7891,8 +7912,8 @@
 
     <!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
     <string name="notification_bubbles_title">Bubbles</string>
-    <!-- Configure Notifications: Summary for the notification bubbles option. [CHAR LIMIT=NONE] -->
-    <string name="notification_bubbles_summary">Quickly access app content from anywhere using floating shortcuts</string>
+    <!-- Developer setting summary for bubbles [CHAR LIMIT=NONE] -->
+    <string name="notification_bubbles_developer_setting_summary">Some notifications can appear as bubbles on the screen</string>
     <!-- Feature education for bubbles. [CHAR LIMIT=NONE] -->
     <string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>
     <!-- Title for the toggle shown on the app-level bubbles page  [CHAR LIMIT=60] -->
@@ -10035,6 +10056,12 @@
     <!-- [CHAR LIMIT=60] Name of setting that changes the UI to dark -->
     <string name="dark_ui_mode">Dark Theme</string>
 
+    <!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is still on-->
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on">On / Temporarily disabled due to Battery Saver</string>
+
+    <!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is off-->
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off">Temporarily turned on due to Battery Saver</string>
+
     <!-- [CHAR_LIMIT=NONE] Summary that is shown in the footer when dark mode is selected -->
     <string name="dark_ui_settings_dark_summary">Supported apps will also switch to dark theme</string>
 
@@ -10134,11 +10161,11 @@
     <!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
     <string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
 
-    <!-- Title text for system navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="system_navigation_title" translatable="false">System navigation</string>
+    <!-- Title text for system navigation [CHAR LIMIT=60] -->
+    <string name="system_navigation_title">System navigation</string>
 
-    <!-- Title text for swipe up to switch apps [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="swipe_up_to_switch_apps_title" translatable="false">2-button navigation</string>
+    <!-- Title text for swipe up to switch apps [CHAR LIMIT=60] -->
+    <string name="swipe_up_to_switch_apps_title">2-button navigation</string>
     <!-- Summary text for swipe up to switch apps  [CHAR LIMIT=250] -->
     <string name="swipe_up_to_switch_apps_summary">To switch apps, swipe up on the Home button. Swipe up again to see all apps. Works from any screen. You’ll no longer have an Overview button on the bottom right of your screen.</string>
     <!-- Title for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
@@ -10146,15 +10173,18 @@
     <!-- Summary for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
     <string name="swipe_up_to_switch_apps_suggestion_summary">Turn on the new gesture to switch apps</string>
 
-    <!-- Title text for edge to edge navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="edge_to_edge_navigation_title" translatable="false">Fully gestural navigation</string>
-    <!-- Summary text for edge to edge navigation  [CHAR LIMIT=None] [DO NOT TRANSLATE] -->
-    <string name="edge_to_edge_navigation_summary" translatable="false">To go Home, swipe up from the bottom of the screen. To go Back, swipe from either the left or right edge of the screen. To switch apps, start swiping up from the bottom of the screen and hold before releasing.</string>
+    <!-- Title text for edge to edge navigation [CHAR LIMIT=60] -->
+    <string name="edge_to_edge_navigation_title">Gesture navigation</string>
+    <!-- Summary text for edge to edge navigation [CHAR LIMIT=NONE] -->
+    <string name="edge_to_edge_navigation_summary">To go Home, swipe up from the bottom of the screen. To go Back, swipe from either the left or right edge of the screen. To switch apps, start swiping up from the bottom of the screen and hold before releasing.</string>
 
-    <!-- Title text for 3-button navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="legacy_navigation_title" translatable="false">3-button navigation</string>
-    <!-- Summary text for 3-button navigation  [CHAR LIMIT=250] [DO NOT TRANSLATE] -->
-    <string name="legacy_navigation_summary" translatable="false">Classic Android navigation mode where going Home, switching apps, and going Back are accessible via buttons.</string>
+    <!-- Title text for 3-button navigation [CHAR LIMIT=60] -->
+    <string name="legacy_navigation_title">3-button navigation</string>
+    <!-- Summary text for 3-button navigation  [CHAR LIMIT=NONE] -->
+    <string name="legacy_navigation_summary">Classic Android navigation mode where going Home, switching apps, and going Back are accessible via buttons.</string>
+
+    <!-- Search keywords for System Navigation settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_system_navigation">system navigation, 2 button navigation, 3 button navigation, gesture navigation</string>
 
     <!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="default">Double-tap to check phone</string>
@@ -10542,9 +10572,9 @@
 
     <!-- Note displayed when certain features are not available on low ram devices. [CHAR LIMIT=NONE] -->
     <string name="disabled_low_ram_device">This feature is not available on this device</string>
-    <!-- Note displayed when certain features are not available. [CHAR LIMIT=NONE] -->
+    <!-- Title of a message for an empty state screen. A user will see this message if they try to use a certain feature, but the feature was turned off so it won't slow down their phone. [CHAR LIMIT=NONE] -->
     <string name="disabled_feature">Feature not available</string>
-    <!-- Note displayed to explain that a feature is not available because it will slow down the phone. [CHAR LIMIT=NONE] -->
+    <!-- Part of a message for an empty state screen. A user will see this message if they try to use a certain feature, but the feature was turned off so it won't slow down their phone. [CHAR LIMIT=NONE] -->
     <string name="disabled_feature_reason_slow_down_phone">This feature has been turned off because it slows down your phone</string>
 
     <!-- UI debug setting: preference title - enforce full raw GNSS satellite measurements [CHAR LIMIT=60] -->
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 5cd7a6c..1f4421f 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -27,6 +27,7 @@
         <item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
         <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle
         </item>
+        <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
     </style>
 
     <style name="PreferenceTheme.SetupWizard">
@@ -63,6 +64,10 @@
         <item name="android:negativeButtonText">@android:string/cancel</item>
     </style>
 
+    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">
+        <item name="android:divider">@*android:drawable/list_divider_material</item>
+    </style>
+
     <style name="SetupWizardPreferenceFragmentStyle" parent="PreferenceFragment.Material">
         <item name="android:layout">@layout/setup_preference</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4edd943..cc265ba 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -27,8 +27,11 @@
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:clipChildren">false</item>
         <item name="android:listPreferredItemHeight">72dip</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -88,6 +91,7 @@
     </style>
 
     <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
+        <item name="android:elevation">1dp</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
         <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
@@ -231,4 +235,17 @@
         <item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
     </style>
 
+    <!-- Light theme for those pages inherit SubSettings and launched during setup flow -->
+    <style name="LightTheme.SubSettings.SetupWizard" parent="@android:style/Theme.DeviceDefault.Light">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
+
+        <item name="android:colorPrimary">@android:color/white</item>
+        <item name="android:colorPrimaryDark">@android:color/white</item>
+        <item name="android:colorAccent">@color/material_blue_700</item>
+    </style>
 </resources>
diff --git a/res/xml/accessibility_content_timeout_settings.xml b/res/xml/accessibility_content_timeout_settings.xml
deleted file mode 100644
index ea8d88a..0000000
--- a/res/xml/accessibility_content_timeout_settings.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="accessibility_content_timeout_preference"
-    android:title="@string/accessibility_content_timeout_preference_title"
-    android:persistent="false" >
-
-    <com.android.settings.widget.VideoPreference
-        android:key="accessibility_content_timeout_video"
-        android:title="@string/summary_placeholder"
-        settings:animation="@raw/accessibility_timeout"
-        settings:preview="@drawable/accessibility_timeout"
-        settings:controller="com.android.settings.widget.VideoPreferenceController"
-        android:persistent="false" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="accessibility_content_timeout_default"
-        android:title="@string/accessibility_timeout_default"
-        settings:allowDividerAbove="true"
-        android:persistent="false" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="accessibility_content_timeout_10secs"
-        android:title="@string/accessibility_timeout_10secs"
-        android:persistent="false" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="accessibility_content_timeout_30secs"
-        android:title="@string/accessibility_timeout_30secs"
-        android:persistent="false" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="accessibility_content_timeout_1min"
-        android:title="@string/accessibility_timeout_1min"
-        android:persistent="false" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="accessibility_content_timeout_2mins"
-        android:title="@string/accessibility_timeout_2mins"
-        android:persistent="false" />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:title="@string/accessibility_content_timeout_preference_summary"
-        android:selectable="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index b4968f8..d9c61b5 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -77,12 +77,6 @@
             android:key="toggle_disable_animations"
             android:title="@string/accessibility_disable_animations" />
 
-        <Preference
-            android:fragment="com.android.settings.accessibility.AccessibilityContentTimeoutPreferenceFragment"
-            android:key="accessibility_content_timeout_preference_fragment"
-            android:title="@string/accessibility_content_timeout_preference_title"
-            android:persistent="false" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -115,7 +109,7 @@
         <Preference
             android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
             android:key="accessibility_control_timeout_preference_fragment"
-            android:title="@string/accessibility_control_timeout_preference_title"
+            android:title="@string/accessibility_setting_item_control_timeout_title"
             android:persistent="false" />
 
         <Preference
diff --git a/res/xml/bubble_notification_settings.xml b/res/xml/bubble_notification_settings.xml
deleted file mode 100644
index 7fba125..0000000
--- a/res/xml/bubble_notification_settings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/bubbles_app_toggle_title"
-                  android:key="bubble_notification_settings">
-
-        <com.android.settings.widget.VideoPreference
-            android:key="bubbles_illustration"
-            android:title="@string/summary_placeholder"
-            settings:animation="@raw/bubbles"
-            settings:controller="com.android.settings.widget.VideoPreferenceController"
-            android:persistent="false" />
-
-        <!-- Notification bubbles -->
-        <SwitchPreference
-            android:key="global_notification_bubbles"
-            android:title="@string/notification_bubbles_title"
-            android:summary="@string/notification_bubbles_summary"
-            settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>
-
-        <com.android.settingslib.widget.FooterPreference
-            android:key="notification_bubbles_footer"
-            android:title="@string/bubbles_feature_education"
-            android:selectable="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 3129738..56e0e2d 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -21,6 +21,12 @@
     android:key="captioning_preference_screen"
     android:title="@string/accessibility_captioning_title" >
 
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="caption_preview"
+        android:title="@string/summary_placeholder"
+        android:layout="@layout/captioning_preview"
+        settings:searchable="false"/>
+
     <PreferenceCategory
         android:key="standard"
         android:title="@string/captioning_standard_options_title" >
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index af27869..687fe83 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -74,13 +74,6 @@
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
-        <!-- Notification bubbles -->
-        <Preference
-            android:key="notification_bubbles"
-            android:title="@string/notification_bubbles_title"
-            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
-            android:fragment="com.android.settings.notification.BubbleNotificationSettings"/>
-
         <!-- Pulse notification light -->
         <SwitchPreference
             android:key="notification_pulse"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 908529e..c537f3f 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -560,6 +560,12 @@
             android:key="device_identifier_access_restrictions"
             android:title="@string/device_identifier_access_restrictions_title"
             android:summary="@string/device_identifier_access_restrictions_summary" />
+
+        <SwitchPreference
+            android:key="notification_bubbles"
+            android:title="@string/notification_bubbles_title"
+            android:summary="@string/notification_bubbles_developer_setting_summary"/>
+
     </PreferenceCategory>
 
     <com.android.settings.development.autofill.AutofillPreferenceCategory
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 5dcb1b0..ff3a6b5 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -49,7 +49,7 @@
         android:key="gesture_system_navigation_input_summary"
         android:title="@string/system_navigation_title"
         android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
-        settings:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
+        settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
 
     <Preference
         android:key="gesture_tap_screen_input_summary"
diff --git a/res/xml/location_recent_requests_see_all.xml b/res/xml/location_recent_requests_see_all.xml
new file mode 100644
index 0000000..dfb8804
--- /dev/null
+++ b/res/xml/location_recent_requests_see_all.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/location_category_recent_location_requests"
+        android:key="recent_location_requests_see_all">
+        <PreferenceCategory
+            android:key="all_recent_location_requests"/>
+</PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 9ab80a7..136e6ab 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -20,11 +20,16 @@
         android:title="@string/location_settings_title"
         settings:keywords="@string/keywords_location">
 
-        <com.android.settingslib.widget.LayoutPreference
-            android:key="apps_dashboard"
-            android:layout="@layout/app_entities_header"
-            android:selectable="false"
-            settings:allowDividerBelow="true" />
+        <PreferenceCategory
+            android:key="recent_location_requests"
+            android:title="@string/location_category_recent_location_requests"/>
+
+        <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"/>
 
         <PreferenceCategory
             android:key="location_advanced_settings"
diff --git a/res/xml/system_navigation_gesture_settings.xml b/res/xml/system_navigation_gesture_settings.xml
index 97aacb8..b1045fc 100644
--- a/res/xml/system_navigation_gesture_settings.xml
+++ b/res/xml/system_navigation_gesture_settings.xml
@@ -17,35 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="gesture_system_navigation_screen"
-    android:title="@string/system_navigation_title">
-
-    <com.android.settings.widget.VideoPreference
-        android:key="gesture_swipe_up_video"
-        app:animation="@raw/gesture_swipe_up"
-        app:preview="@drawable/gesture_swipe_up" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="gesture_edge_to_edge"
-        android:title="@string/edge_to_edge_navigation_title"
-        android:summary="@string/edge_to_edge_navigation_summary"
-        app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController"
-        app:allowDividerAbove="true" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="gesture_swipe_up"
-        android:title="@string/swipe_up_to_switch_apps_title"
-        android:summary="@string/swipe_up_to_switch_apps_summary"
-        app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController" />
-
-    <com.android.settings.widget.RadioButtonPreference
-        android:key="gesture_legacy"
-        android:title="@string/legacy_navigation_title"
-        android:summary="@string/legacy_navigation_summary"
-        app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.SystemNavigationLegacyPreferenceController" />
-
-</PreferenceScreen>
\ No newline at end of file
+    android:title="@string/system_navigation_title"
+    settings:keywords="@string/keywords_system_navigation"/>
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 515b1b0..c132c89 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -84,8 +84,7 @@
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
     public static class EncryptionInterstitialFragment extends InstrumentedFragment {
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4ac4be4..3b01b32 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -35,7 +35,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 
 import androidx.annotation.Nullable;
@@ -51,7 +50,6 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.backup.BackupSettingsHelper;
 import com.android.settings.backup.UserBackupSettingsActivity;
 import com.android.settings.core.OnActivityResultListener;
 import com.android.settings.core.SettingsBaseActivity;
@@ -67,6 +65,8 @@
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.drawer.DashboardCategory;
 
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -166,8 +166,6 @@
 
     private Button mNextButton;
 
-    private ViewGroup mContent;
-
     // Categories
     private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
 
@@ -243,15 +241,15 @@
                 intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, false);
 
         // If this is a sub settings, then apply the SubSettings Theme for the ActionBar content
-        // insets
-        if (isSubSettings) {
+        // insets.
+        // If this is in setup flow, don't apply theme. Because light theme needs to be applied
+        // in SettingsBaseActivity#onCreate().
+        if (isSubSettings && !WizardManagerHelper.isAnySetupWizard(getIntent())) {
             setTheme(R.style.Theme_SubSettings);
         }
 
         setContentView(R.layout.settings_main_prefs);
 
-        mContent = findViewById(R.id.main_content);
-
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
         if (savedState != null) {
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 989cc2b..d9e265f 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -18,8 +18,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
-import android.widget.LinearLayout;
 
 /**
  * Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic
@@ -53,13 +51,6 @@
         return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
-
     public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
     }
 }
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 077d94c..bce6f3f 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -16,12 +16,18 @@
 
 package com.android.settings;
 
+import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_FIRST_RUN;
+import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
+
 import android.content.Intent;
+import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.util.ThemeHelper;
 
+import java.util.Arrays;
+
 
 public class SetupWizardUtils {
 
@@ -90,4 +96,14 @@
     public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
         WizardManagerHelper.copyWizardManagerExtras(fromIntent, toIntent);
     }
+
+    public static Bundle copyLifecycleExtra(Bundle srcBundle, Bundle dstBundle) {
+        for (String key :
+                Arrays.asList(
+                        EXTRA_IS_FIRST_RUN,
+                        EXTRA_IS_SETUP_FLOW)) {
+            dstBundle.putBoolean(key, srcBundle.getBoolean(key, false));
+        }
+        return dstBundle;
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java
deleted file mode 100644
index 8a41bd4..0000000
--- a/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.res.Resources;
-import android.provider.SearchIndexableResource;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@SearchIndexable
-public final class AccessibilityContentTimeoutPreferenceFragment extends DashboardFragment
-        implements AccessibilityTimeoutController.OnChangeListener {
-
-    static final String TAG = "AccessibilityContentTimeoutPreferenceFragment";
-    private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
-
-    @Override
-    public void onCheckedChanged(Preference preference) {
-        for (AbstractPreferenceController controller : sControllers) {
-            controller.updateState(preference);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        for (AbstractPreferenceController controller :
-                buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
-            ((AccessibilityTimeoutController)controller).setOnChangeListener(this);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        for (AbstractPreferenceController controller :
-                buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
-            ((AccessibilityTimeoutController)controller).setOnChangeListener(null);
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.ACCESSIBILITY;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.accessibility_content_timeout_settings;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getSettingsLifecycle());
-    }
-
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Lifecycle lifecycle) {
-        if (sControllers.size() == 0) {
-            Resources resources = context.getResources();
-
-            String[] timeoutKeys = resources.getStringArray(
-                    R.array.accessibility_timeout_content_selector_keys);
-
-            for (int i=0; i < timeoutKeys.length; i++) {
-                sControllers.add(new AccessibilityTimeoutController(
-                        context, lifecycle, timeoutKeys[i], TAG));
-            }
-        }
-        return sControllers;
-    }
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.accessibility_content_timeout_settings;
-                    return Arrays.asList(sir);
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-                    return keys;
-                }
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null);
-                }
-            };
-}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
index a6426bf..df950e8 100644
--- a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
@@ -98,7 +98,7 @@
 
             for (int i=0; i < timeoutKeys.length; i++) {
                 sControllers.add(new AccessibilityTimeoutController(
-                        context, lifecycle, timeoutKeys[i], TAG));
+                        context, lifecycle, timeoutKeys[i]));
             }
         }
         return sControllers;
@@ -126,4 +126,4 @@
                     return buildPreferenceControllers(context, null);
                 }
             };
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 148e901..1dbae00 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -132,8 +132,6 @@
             "vibration_preference_screen";
     private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
             "daltonizer_preference";
-    private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE =
-            "accessibility_content_timeout_preference_fragment";
     private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
             "accessibility_control_timeout_preference_fragment";
     private static final String DARK_UI_MODE_PREFERENCE =
@@ -727,8 +725,6 @@
                     mToggleInversionPreference.getOrder() + 1);
             mToggleDisableAnimationsPreference.setOrder(
                     mToggleLargePointerIconPreference.getOrder() + 1);
-            findPreference(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE).setOrder(
-                    mToggleDisableAnimationsPreference.getOrder() + 1);
             mToggleInversionPreference.setSummary(R.string.summary_empty);
             displayCategory.addPreference(mToggleInversionPreference);
             displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
@@ -795,8 +791,6 @@
         updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
 
         updateAccessibilityTimeoutSummary(getContentResolver(),
-                findPreference(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE));
-        updateAccessibilityTimeoutSummary(getContentResolver(),
                 findPreference(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE));
     }
 
@@ -806,14 +800,8 @@
         int[] timeoutValues = getResources().getIntArray(
                 R.array.accessibility_timeout_selector_values);
 
-        int timeoutValue = 0;
-        if (pref.getKey().equals(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE)) {
-            timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
-                    resolver, AccessibilityTimeoutController.CONTENT_TIMEOUT_SETTINGS_SECURE);
-        } else if (pref.getKey().equals(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE)) {
-            timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
+        int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
                     resolver, AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
-        }
 
         int idx = Ints.indexOf(timeoutValues, timeoutValue);
         pref.setSummary(timeoutSummarys[idx == -1 ? 0 : idx]);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index fc68d2c..0ed1644 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -16,23 +16,35 @@
 
 package com.android.settings.accessibility;
 
+import android.content.ComponentName;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.accessibility.AccessibilityEvent;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.android.settings.SettingsActivity;
+import com.android.settings.SetupWizardUtils;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.display.FontSizePreferenceFragmentForSetupWizard;
 import com.android.settings.search.actionbar.SearchMenuController;
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
 public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
 
+    private static final String LOG_TAG = "A11ySettingsForSUW";
     private static final String SAVE_KEY_TITLE = "activity_title";
 
+    @VisibleForTesting
+    static final String CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW =
+            "com.android.settings.FontSizeSettingsForSetupWizardActivity";
+
     @Override
     protected void onSaveInstanceState(Bundle savedState) {
         savedState.putCharSequence(SAVE_KEY_TITLE, getTitle());
@@ -79,4 +91,33 @@
                 .launch();
         return true;
     }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+
+        tryLaunchFontSizeSettings();
+    }
+
+    @VisibleForTesting
+    void tryLaunchFontSizeSettings() {
+        if (WizardManagerHelper.isAnySetupWizard(getIntent())
+                && new ComponentName(getPackageName(),
+                CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW).equals(
+                getIntent().getComponent())) {
+            final Bundle args = new Bundle();
+            args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);
+            args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
+            final SubSettingLauncher subSettingLauncher = new SubSettingLauncher(this)
+                    .setDestination(FontSizePreferenceFragmentForSetupWizard.class.getName())
+                    .setArguments(args)
+                    .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
+                    .setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),
+                            new Bundle()));
+
+            Log.d(LOG_TAG, "Launch font size settings");
+            subSettingLauncher.launch();
+            finish();
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
index a6c5f6f..057013c 100644
--- a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
+++ b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
@@ -36,6 +36,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Controller class that control accessibility time out settings.
+ */
 public class AccessibilityTimeoutController extends AbstractPreferenceController implements
         LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin {
     static final String CONTENT_TIMEOUT_SETTINGS_SECURE =
@@ -43,11 +46,11 @@
     static final String CONTROL_TIMEOUT_SETTINGS_SECURE =
             Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS;
 
-    // pair the preference key and timeout value
+    // pair the preference key and timeout value.
     private final Map<String, Integer> mAccessibilityTimeoutKeyToValueMap = new HashMap<>();
 
+    // RadioButtonPreference key, each preference represent a timeout value.
     private final String mPreferenceKey;
-    private final String mfragmentTag;
     private final ContentResolver mContentResolver;
     private final Resources mResources;
     private OnChangeListener mOnChangeListener;
@@ -55,7 +58,7 @@
     private int mAccessibilityUiTimeoutValue;
 
     public AccessibilityTimeoutController(Context context, Lifecycle lifecycle,
-            String preferenceKey, String fragmentTag) {
+            String preferenceKey) {
         super(context);
 
         mContentResolver = context.getContentResolver();
@@ -65,7 +68,6 @@
             lifecycle.addObserver(this);
         }
         mPreferenceKey = preferenceKey;
-        mfragmentTag = fragmentTag;
     }
 
     protected static int getSecureAccessibilityTimeoutValue(ContentResolver resolver, String name) {
@@ -84,14 +86,8 @@
     private Map<String, Integer> getTimeoutValueToKeyMap() {
         if (mAccessibilityTimeoutKeyToValueMap.size() == 0) {
 
-            String[] timeoutKeys = null;
-            if (mfragmentTag.equals(AccessibilityContentTimeoutPreferenceFragment.TAG)) {
-                timeoutKeys = mResources.getStringArray(
-                        R.array.accessibility_timeout_content_selector_keys);
-            } else if (mfragmentTag.equals(AccessibilityControlTimeoutPreferenceFragment.TAG)) {
-                timeoutKeys = mResources.getStringArray(
+            String[] timeoutKeys = mResources.getStringArray(
                         R.array.accessibility_timeout_control_selector_keys);
-            }
 
             int[] timeoutValues = mResources.getIntArray(
                     R.array.accessibility_timeout_selector_values);
@@ -109,11 +105,9 @@
     }
 
     private void handlePreferenceChange(String value) {
-        if (mfragmentTag.equals(AccessibilityContentTimeoutPreferenceFragment.TAG)) {
-            putSecureString(Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, value);
-        } else if (mfragmentTag.equals(AccessibilityControlTimeoutPreferenceFragment.TAG)) {
-            putSecureString(Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, value);
-        }
+        // save value to both content and control timeout setting.
+        putSecureString(Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, value);
+        putSecureString(Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, value);
     }
 
     @Override
@@ -144,16 +138,10 @@
         }
     }
 
-    private int getAccessibilityTimeoutValue(String fragmentTag) {
-        int timeoutValue = 0;
-        // two kinds of Secure value, one is content timeout, the other is control timeout.
-        if (AccessibilityContentTimeoutPreferenceFragment.TAG.equals(fragmentTag)) {
-            timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
-                    CONTENT_TIMEOUT_SETTINGS_SECURE);
-        } else if (AccessibilityControlTimeoutPreferenceFragment.TAG.equals(fragmentTag)) {
-            timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
+    private int getAccessibilityTimeoutValue() {
+        // get accessibility control timeout value
+        int timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
                     CONTROL_TIMEOUT_SETTINGS_SECURE);
-        }
         return timeoutValue;
     }
 
@@ -167,7 +155,7 @@
     public void updateState(Preference preference) {
         super.updateState(preference);
 
-        mAccessibilityUiTimeoutValue = getAccessibilityTimeoutValue(mfragmentTag);
+        mAccessibilityUiTimeoutValue = getAccessibilityTimeoutValue();
 
         // reset RadioButton
         mPreference.setChecked(false);
@@ -175,7 +163,13 @@
         updatePreferenceCheckedState(preferenceValue);
     }
 
-    public static interface OnChangeListener {
+    /**
+     * Listener interface handles checked event.
+     */
+    public interface OnChangeListener {
+        /**
+         * A hook that is called when preference checked.
+         */
         void onCheckedChanged(Preference preference);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index ae7e3fd..bddca9c 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -22,13 +22,8 @@
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.preference.PreferenceFrameLayout;
 import android.provider.Settings;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnLayoutChangeListener;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
@@ -46,6 +41,7 @@
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 import com.android.settingslib.accessibility.AccessibilityUtils;
+import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.Locale;
 
@@ -54,6 +50,7 @@
  */
 public class CaptionPropertiesFragment extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, OnValueChangedListener {
+    private static final String PREF_CAPTION_PREVIEW = "caption_preview";
     private static final String PREF_BACKGROUND_COLOR = "captioning_background_color";
     private static final String PREF_BACKGROUND_OPACITY = "captioning_background_opacity";
     private static final String PREF_FOREGROUND_COLOR = "captioning_foreground_color";
@@ -116,43 +113,6 @@
     }
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.captioning_preview, container, false);
-
-        // We have to do this now because PreferenceFrameLayout looks at it
-        // only when the view is added.
-        if (container instanceof PreferenceFrameLayout) {
-            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
-        }
-
-        final View content = super.onCreateView(inflater, container, savedInstanceState);
-        ((ViewGroup) rootView.findViewById(R.id.properties_fragment)).addView(
-                content, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-
-        return rootView;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        final boolean enabled = mCaptioningManager.isEnabled();
-        mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
-        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
-
-        mPreviewWindow = view.findViewById(R.id.preview_window);
-        mPreviewViewport = view.findViewById(R.id.preview_viewport);
-        mPreviewViewport.addOnLayoutChangeListener(new OnLayoutChangeListener() {
-            @Override
-            public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                    int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                refreshPreviewText();
-            }
-        });
-    }
-
-    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
@@ -263,6 +223,19 @@
     }
 
     private void initializeAllPreferences() {
+        final LayoutPreference captionPreview = findPreference(PREF_CAPTION_PREVIEW);
+
+        final boolean enabled = mCaptioningManager.isEnabled();
+        mPreviewText = captionPreview.findViewById(R.id.preview_text);
+        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+
+        mPreviewWindow = captionPreview.findViewById(R.id.preview_window);
+
+        mPreviewViewport = captionPreview.findViewById(R.id.preview_viewport);
+        mPreviewViewport.addOnLayoutChangeListener(
+                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom)
+                        -> refreshPreviewText());
+
         mLocale = (LocalePreference) findPreference(PREF_LOCALE);
         mFontSize = (ListPreference) findPreference(PREF_FONT_SIZE);
 
@@ -370,9 +343,9 @@
     /**
      * Unpack the specified color value and update the preferences.
      *
-     * @param color color preference
+     * @param color   color preference
      * @param opacity opacity preference
-     * @param value packed value
+     * @param value   packed value
      */
     private void parseColorOpacity(ColorPreference color, ColorPreference opacity, int value) {
         final int colorValue;
diff --git a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
index 3403b3b..3e12011 100644
--- a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
@@ -51,7 +51,7 @@
 
     @Override
     protected int getPreviewVibrationAudioAttributesUsage() {
-        return AudioAttributes.USAGE_NOTIFICATION;
+        return AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index bb26283..dcf1f1c 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -15,8 +15,6 @@
  */
 package com.android.settings.accessibility;
 
-import static android.content.DialogInterface.BUTTON_POSITIVE;
-
 import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
 
@@ -25,7 +23,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -191,6 +188,7 @@
                 ((ShortcutServicePickerFragment) fragment).onServiceConfirmed(
                         bundle.getString(EXTRA_KEY));
             }
+            dismiss();
         }
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index b28d8b5..4fe6507 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -86,6 +86,16 @@
     }
 
     @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mSwitchBar.setLabelDelegate((boolean isChecked) -> {
+            final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+            return getString(R.string.accessibility_service_master_switch_title,
+                    info.getResolveInfo().loadLabel(getPackageManager()));
+        });
+    }
+
+    @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
         updateSwitchBarToggleSwitch();
@@ -120,7 +130,7 @@
                 return serviceInfo;
             }
         }
-        return null;
+        throw new IllegalStateException("ServiceInfo is not found.");
     }
 
     @Override
@@ -128,18 +138,12 @@
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING: {
                 final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                if (info == null) {
-                    return null;
-                }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getActivity(), info, this);
                 break;
             }
             case DIALOG_ID_DISABLE_WARNING: {
                 AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                if (info == null) {
-                    return null;
-                }
                 mDialog = AccessibilityServiceWarning
                         .createDisableDialog(getActivity(), info, this);
                 break;
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index 7d9fdcf..4d19151 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -92,7 +92,6 @@
             .addUid(mParent.getAppEntry().info.uid)
             .setRetrieveDetail(false)
             .setNetworkTemplate(template)
-            .setSubscriberId(template.getSubscriberId())
             .build();
     }
 
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index d80304f..85e4acd 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -164,9 +164,11 @@
         final int errorMsg = checkMaxEnrolled();
         if (errorMsg == 0) {
             mErrorText.setText(null);
+            mErrorText.setVisibility(View.GONE);
             getNextButton().setVisibility(View.VISIBLE);
         } else {
             mErrorText.setText(errorMsg);
+            mErrorText.setVisibility(View.VISIBLE);
             getNextButton().setText(getResources().getString(R.string.done));
             getNextButton().setVisibility(View.VISIBLE);
         }
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 9660f3b..956ba49 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -30,8 +30,10 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.Button;
 import android.widget.CompoundButton;
+import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -48,8 +50,8 @@
     private static final String TAG = "FaceEducation";
     private static final int ON = 1;
     private static final int OFF = 0;
-    // 10 seconds.
-    private static final long FACE_ENROLL_EDUCATION_DELAY = 16000;
+    // 8 seconds.
+    private static final long FACE_ENROLL_EDUCATION_DELAY = 8000;
 
     private FaceManager mFaceManager;
     private FaceEnrollAccessibilityToggle mSwitchDiversity;
@@ -57,19 +59,29 @@
     private IllustrationVideoView mIllustrationNormal;
     private View mIllustrationAccessibility;
     private Handler mHandler;
+    private Intent mResultIntent;
+    private TextView mDescriptionText;
 
     private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =
             new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    int titleRes = isChecked ?
+                            R.string.security_settings_face_enroll_education_title_accessibility
+                            : R.string.security_settings_face_enroll_education_title;
+                    getLayout().setHeaderText(titleRes);
+                    setTitle(titleRes);
+
                     if (isChecked) {
                         mIllustrationNormal.stop();
                         mIllustrationNormal.setVisibility(View.INVISIBLE);
                         mIllustrationAccessibility.setVisibility(View.VISIBLE);
+                        mDescriptionText.setVisibility(View.INVISIBLE);
                     } else {
                         mIllustrationNormal.setVisibility(View.VISIBLE);
                         mIllustrationNormal.start();
                         mIllustrationAccessibility.setVisibility(View.INVISIBLE);
+                        mDescriptionText.setVisibility(View.VISIBLE);
                     }
                 }
             };
@@ -83,18 +95,10 @@
         mHandler = new Handler();
 
         mFaceManager = Utils.getFaceManagerOrNull(this);
-        final Button accessibilityButton = findViewById(R.id.accessibility_button);
-        accessibilityButton.setOnClickListener(view -> {
-            mSwitchDiversity.setChecked(true);
-            accessibilityButton.setVisibility(View.GONE);
-            mSwitchDiversity.setVisibility(View.VISIBLE);
-        });
-
-        mSwitchDiversity = findViewById(R.id.toggle_diversity);
-        mSwitchDiversity.setListener(mSwitchDiversityListener);
 
         mIllustrationNormal = findViewById(R.id.illustration_normal);
         mIllustrationAccessibility = findViewById(R.id.illustration_accessibility);
+        mDescriptionText = findViewById(R.id.sud_layout_description);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
@@ -107,17 +111,23 @@
         );
 
         final FooterButton footerButton = new FooterButton.Builder(this)
-                .setText(R.string.wizard_next)
+                .setText(R.string.security_settings_face_enroll_education_start)
                 .setListener(this::onNextButtonClick)
                 .setButtonType(FooterButton.ButtonType.NEXT)
                 .setTheme(R.style.SudGlifButton_Primary)
                 .build();
 
+        boolean accessibilityEnabled = false;
+        final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
+                AccessibilityManager.class);
+        if (accessibilityManager != null) {
+            accessibilityEnabled = accessibilityManager.isEnabled();
+        }
         mFooterBarMixin.setPrimaryButton(footerButton);
         final Context context = getApplicationContext();
         final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),
                 FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;
-        if (!didDisplayEdu) {
+        if (!didDisplayEdu && !accessibilityEnabled) {
             Settings.Secure.putIntForUser(context.getContentResolver(),
                     FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);
             footerButton.setEnabled(false);
@@ -125,6 +135,21 @@
                 footerButton.setEnabled(true);
             }, FACE_ENROLL_EDUCATION_DELAY);
         }
+
+        final Button accessibilityButton = findViewById(R.id.accessibility_button);
+        accessibilityButton.setOnClickListener(view -> {
+            footerButton.setEnabled(true);
+            mSwitchDiversity.setChecked(true);
+            accessibilityButton.setVisibility(View.GONE);
+            mSwitchDiversity.setVisibility(View.VISIBLE);
+        });
+
+        mSwitchDiversity = findViewById(R.id.toggle_diversity);
+        mSwitchDiversity.setListener(mSwitchDiversityListener);
+
+        if (accessibilityEnabled) {
+            accessibilityButton.callOnClick();
+        }
     }
 
     @Override
@@ -151,6 +176,9 @@
             intent.setClass(this, FaceEnrollEnrolling.class);
         }
         intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
+        if (mResultIntent != null) {
+            intent.putExtras(mResultIntent);
+        }
         WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
         startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
     }
@@ -162,9 +190,13 @@
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mResultIntent = data;
         if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {
-            setResult(resultCode);
-            finish();
+            // If the user finished or skipped enrollment, finish this activity
+            if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
+                setResult(resultCode);
+                finish();
+            }
         }
     }
 
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
index 990e68d..d532a76 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
@@ -94,6 +94,7 @@
             Log.e(TAG, "Unable to remove face: " + face.getBiometricId()
                     + " error: " + errMsgId + " " + errString);
             Toast.makeText(mContext, errString, Toast.LENGTH_SHORT).show();
+            mRemoving = false;
         }
 
         @Override
@@ -131,6 +132,7 @@
                 mFaceManager.remove(faces.get(0), mUserId, mRemovalCallback);
             } else {
                 mButton.setEnabled(true);
+                mRemoving = false;
             }
         }
     };
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index cd13654..5ff81d5 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -37,8 +37,11 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.SubSettings;
 import com.android.settings.dashboard.CategoryManager;
 
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,6 +68,10 @@
         if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {
             requestWindowFeature(Window.FEATURE_NO_TITLE);
         }
+        // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
+        if (WizardManagerHelper.isAnySetupWizard(getIntent()) && this instanceof SubSettings) {
+            setTheme(R.style.LightTheme_SubSettings_SetupWizard);
+        }
         super.setContentView(R.layout.settings_base_layout);
 
         final Toolbar toolbar = findViewById(R.id.action_bar);
diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java
index 39ecd78..5d9a528 100644
--- a/src/com/android/settings/core/SubSettingLauncher.java
+++ b/src/com/android/settings/core/SubSettingLauncher.java
@@ -19,6 +19,7 @@
 import android.annotation.StringRes;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -89,6 +90,11 @@
         return this;
     }
 
+    public SubSettingLauncher setExtras(Bundle extras) {
+        mLaunchRequest.extras = extras;
+        return this;
+    }
+
     public SubSettingLauncher setSourceMetricsCategory(int sourceMetricsCategory) {
         mLaunchRequest.sourceMetricsCategory = sourceMetricsCategory;
         return this;
@@ -136,6 +142,7 @@
 
     public Intent toIntent() {
         final Intent intent = new Intent(Intent.ACTION_MAIN);
+        copyExtras(intent);
         intent.setClass(mContext, SubSettings.class);
         if (TextUtils.isEmpty(mLaunchRequest.destinationName)) {
             throw new IllegalArgumentException("Destination fragment must be set");
@@ -180,6 +187,11 @@
         listener.startActivityForResult(intent, requestCode);
     }
 
+    private void copyExtras(Intent intent) {
+        if (mLaunchRequest.extras != null) {
+            intent.replaceExtras(mLaunchRequest.extras);
+        }
+    }
     /**
      * Simple container that has information about how to launch a subsetting.
      */
@@ -194,5 +206,6 @@
         int mRequestCode;
         UserHandle userHandle;
         Bundle arguments;
+        Bundle extras;
     }
 }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index f50d6ad..d073dbc 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -104,7 +104,6 @@
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.AppBubbleNotificationSettings;
 import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.BubbleNotificationSettings;
 import com.android.settings.notification.ChannelGroupNotificationSettings;
 import com.android.settings.notification.ChannelNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
@@ -216,7 +215,6 @@
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
-            BubbleNotificationSettings.class.getName(),
             AppBubbleNotificationSettings.class.getName(),
             ZenAccessSettings.class.getName(),
             ZenAccessDetails.class.getName(),
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 8bab256..a86459e 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -393,8 +393,7 @@
                 final NetworkCycleDataForUidLoader.Builder builder
                     = NetworkCycleDataForUidLoader.builder(mContext);
                 builder.setRetrieveDetail(true)
-                    .setNetworkTemplate(mTemplate)
-                    .setSubscriberId(mTemplate.getSubscriberId());
+                    .setNetworkTemplate(mTemplate);
                 if (mAppItem.category == AppItem.CATEGORY_USER) {
                     for (int i = 0; i < mAppItem.uids.size(); i++) {
                         builder.addUid(mAppItem.uids.keyAt(i));
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 96a1e22..f477ba3 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -496,7 +496,6 @@
         public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {
             return NetworkCycleChartDataLoader.builder(getContext())
                     .setNetworkTemplate(mTemplate)
-                    .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
                     .build();
         }
 
@@ -523,8 +522,7 @@
             return new NetworkStatsSummaryLoader.Builder(getContext())
                     .setStartTime(mChart.getInspectStart())
                     .setEndTime(mChart.getInspectEnd())
-                    .setNetworkType(mNetworkType)
-                    .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
+                    .setNetworkTemplate(mTemplate)
                     .build();
         }
 
diff --git a/src/com/android/settings/development/BubbleGlobalPreferenceController.java b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
new file mode 100644
index 0000000..86d7be1
--- /dev/null
+++ b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BubbleGlobalPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    public BubbleGlobalPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return NOTIFICATION_BUBBLES;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeSetting((boolean) newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) mPreference).setChecked(isEnabled());
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        writeSetting(false /* isEnabled */);
+        updateState(mPreference);
+    }
+
+    private boolean isEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, OFF) == ON;
+    }
+
+    private void writeSetting(boolean isEnabled) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 77b104b..9dcc222 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -482,6 +482,7 @@
         controllers.add(new DesktopModePreferenceController(context));
         controllers.add(new DeviceIdentifierAccessRestrictionsPreferenceController(context));
         controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
+        controllers.add(new BubbleGlobalPreferenceController(context));
         controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
         controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
         controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 4b2f50d..5c3772b 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -78,9 +78,12 @@
         final Context context = dialog.getContext();
         mSubscriptionInfo = context.getSystemService(SubscriptionManager.class)
                 .getActiveSubscriptionInfoForSimSlotIndex(slotId);
+        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
         if (mSubscriptionInfo != null) {
             mTelephonyManager = context.getSystemService(TelephonyManager.class)
                     .createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
+        } else if(isValidSlotIndex(slotId, tm)) {
+            mTelephonyManager = tm;
         } else {
             mTelephonyManager = null;
         }
@@ -104,6 +107,7 @@
     private void updateDialogForCdmaPhone() {
         final Resources res = mDialog.getContext().getResources();
         mDialog.setText(ID_MEID_NUMBER_VALUE, getMeid());
+        // MIN needs to read from SIM. So if no SIM, we should not show MIN on UI
         mDialog.setText(ID_MIN_NUMBER_VALUE, mSubscriptionInfo != null
                 ? mTelephonyManager.getCdmaMin(mSubscriptionInfo.getSubscriptionId())
                 : "");
@@ -137,7 +141,8 @@
 
     @VisibleForTesting
     String getCdmaPrlVersion() {
-        return mTelephonyManager.getCdmaPrlVersion();
+        // PRL needs to read from SIM. So if no SIM, return empty
+        return mSubscriptionInfo != null ? mTelephonyManager.getCdmaPrlVersion() : "";
     }
 
     @VisibleForTesting
@@ -150,4 +155,9 @@
     String getMeid() {
         return mTelephonyManager.getMeid(mSlotId);
     }
+
+    @VisibleForTesting
+    private boolean isValidSlotIndex(int slotIndex, TelephonyManager telephonyManager) {
+        return slotIndex >= 0 && slotIndex < telephonyManager.getPhoneCount();
+    }
 }
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index 9df2402..d3d30b5 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -17,27 +17,53 @@
 package com.android.settings.display;
 
 import android.app.UiModeManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.PowerManager;
 import android.provider.Settings;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
 
+import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class DarkUIPreferenceController extends TogglePreferenceController {
+public class DarkUIPreferenceController extends TogglePreferenceController implements
+        LifecycleObserver, OnStart, OnStop {
 
     public static final String DARK_MODE_PREFS = "dark_mode_prefs";
     public static final String PREF_DARK_MODE_DIALOG_SEEN = "dark_mode_dialog_seen";
     public static final int DIALOG_SEEN = 1;
+
+    @VisibleForTesting
+    SwitchPreference mPreference;
+
     private UiModeManager mUiModeManager;
+    private PowerManager mPowerManager;
     private Context mContext;
+
     private Fragment mFragment;
 
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateEnabledStateIfNeeded();
+        }
+    };
+
     public DarkUIPreferenceController(Context context, String key) {
         super(context, key);
         mContext = context;
         mUiModeManager = context.getSystemService(UiModeManager.class);
+        mPowerManager = context.getSystemService(PowerManager.class);
     }
 
     @Override
@@ -46,6 +72,18 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        updateEnabledStateIfNeeded();
+    }
+
+    @Override
     public boolean setChecked(boolean isChecked) {
         final boolean dialogSeen =
                 Settings.Secure.getInt(mContext.getContentResolver(),
@@ -68,6 +106,29 @@
     }
 
     @VisibleForTesting
+    void updateEnabledStateIfNeeded() {
+        if (mPreference == null) {
+            return;
+        }
+        boolean isBatterySaver = isPowerSaveMode();
+        mPreference.setEnabled(!isBatterySaver);
+        if (isBatterySaver) {
+            int stringId = mUiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES
+                    ? R.string.dark_ui_mode_disabled_summary_dark_theme_on
+                    : R.string.dark_ui_mode_disabled_summary_dark_theme_off;
+            mPreference.setSummary(mContext.getString(stringId));
+        } else {
+            mPreference.setSummary(null);
+        }
+    }
+
+    @VisibleForTesting
+    boolean isPowerSaveMode() {
+        return mPowerManager.isPowerSaveMode();
+    }
+
+
+    @VisibleForTesting
     void setUiModeManager(UiModeManager uiModeManager) {
         mUiModeManager = uiModeManager;
     }
@@ -77,6 +138,17 @@
     }
 
     @Override
+    public void onStart() {
+        mContext.registerReceiver(mReceiver,
+                new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
+    }
+
+    @Override
+    public void onStop() {
+        mContext.unregisterReceiver(mReceiver);
+    }
+
+    @Override
     public int getAvailabilityStatus() {
         return AVAILABLE;
     }
diff --git a/src/com/android/settings/display/PreviewPagerAdapter.java b/src/com/android/settings/display/PreviewPagerAdapter.java
index 5c43683..018be32 100644
--- a/src/com/android/settings/display/PreviewPagerAdapter.java
+++ b/src/com/android/settings/display/PreviewPagerAdapter.java
@@ -67,7 +67,8 @@
             mPreviewFrames[p].setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     LinearLayout.LayoutParams.MATCH_PARENT));
-
+            mPreviewFrames[p].setClipToPadding(true);
+            mPreviewFrames[p].setClipChildren(true);
             for (int j = 0; j < configurations.length; ++j) {
                 // Create a new configuration for the specified value. It won't
                 // have any theme set, so manually apply the current theme.
diff --git a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java b/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
deleted file mode 100644
index 0c5adc4..0000000
--- a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationEdgeToEdgePreferenceController extends
-        SystemNavigationPreferenceController {
-    static final String PREF_KEY_EDGE_TO_EDGE = "gesture_edge_to_edge";
-
-    public SystemNavigationEdgeToEdgePreferenceController(Context context, String key) {
-        this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
-                Context.OVERLAY_SERVICE)), key);
-    }
-
-    @VisibleForTesting
-    public SystemNavigationEdgeToEdgePreferenceController(Context context,
-            IOverlayManager overlayManager, String key) {
-        super(context, overlayManager, key, NAV_BAR_MODE_GESTURAL_OVERLAY);
-    }
-
-    @Override
-    public void onRadioButtonClicked(RadioButtonPreference preference) {
-        setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY);
-        selectRadioButtonInGroup(PREF_KEY_EDGE_TO_EDGE, mPreferenceScreen);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return isEdgeToEdgeEnabled(mContext);
-    }
-}
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index ea5454b..e17b870 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -16,29 +16,58 @@
 
 package com.android.settings.gestures;
 
+import static android.os.UserHandle.USER_CURRENT;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.om.IOverlayManager;
+import android.graphics.drawable.Drawable;
+import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.provider.SearchIndexableResource;
+import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.widget.VideoPreference;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.CandidateInfo;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 @SearchIndexable
-public class SystemNavigationGestureSettings extends DashboardFragment {
+public class SystemNavigationGestureSettings extends RadioButtonPickerFragment {
 
     private static final String TAG = "SystemNavigationGesture";
 
+    @VisibleForTesting
+    static final String KEY_SYSTEM_NAV_3BUTTONS = "system_nav_3buttons";
+    @VisibleForTesting
+    static final String KEY_SYSTEM_NAV_2BUTTONS = "system_nav_2buttons";
+    @VisibleForTesting
+    static final String KEY_SYSTEM_NAV_GESTURAL = "system_nav_gestural";
+
     public static final String PREF_KEY_SUGGESTION_COMPLETE =
             "pref_system_navigation_suggestion_complete";
 
+    private IOverlayManager mOverlayManager;
+
+    private VideoPreference mVideoPreference;
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -46,6 +75,12 @@
                 .getSuggestionFeatureProvider(context);
         SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
         prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+
+        mOverlayManager = IOverlayManager.Stub.asInterface(
+                ServiceManager.getService(Context.OVERLAY_SERVICE));
+
+        mVideoPreference = new VideoPreference(context);
+        setIllustrationVideo(mVideoPreference, getDefaultKey());
     }
 
     @Override
@@ -54,16 +89,153 @@
     }
 
     @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.system_navigation_gesture_settings;
     }
 
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+    @Override
+    protected void addStaticPreferences(PreferenceScreen screen) {
+        screen.addPreference(mVideoPreference);
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final Context c = getContext();
+        List<NavModeCandidateInfo> candidates = new ArrayList<>();
+
+        if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+                NAV_BAR_MODE_GESTURAL_OVERLAY)) {
+            candidates.add(new NavModeCandidateInfo(
+                    c.getText(R.string.edge_to_edge_navigation_title),
+                    c.getText(R.string.edge_to_edge_navigation_summary),
+                    KEY_SYSTEM_NAV_GESTURAL, true /* enabled */));
+        }
+        if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+                NAV_BAR_MODE_2BUTTON_OVERLAY)) {
+            candidates.add(new NavModeCandidateInfo(
+                    c.getText(R.string.swipe_up_to_switch_apps_title),
+                    c.getText(R.string.swipe_up_to_switch_apps_summary),
+                    KEY_SYSTEM_NAV_2BUTTONS, true /* enabled */));
+        }
+        if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
+                NAV_BAR_MODE_3BUTTON_OVERLAY)) {
+            candidates.add(new NavModeCandidateInfo(
+                    c.getText(R.string.legacy_navigation_title),
+                    c.getText(R.string.legacy_navigation_summary),
+                    KEY_SYSTEM_NAV_3BUTTONS, true /* enabled */));
+        }
+
+        return candidates;
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return getCurrentSystemNavigationMode(getContext());
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        setCurrentSystemNavigationMode(mOverlayManager, key);
+        setIllustrationVideo(mVideoPreference, key);
+        return true;
+    }
+
+    @VisibleForTesting
+    static String getCurrentSystemNavigationMode(Context context) {
+        if (SystemNavigationPreferenceController.isEdgeToEdgeEnabled(context)) {
+            return KEY_SYSTEM_NAV_GESTURAL;
+        } else if (SystemNavigationPreferenceController.isSwipeUpEnabled(context)) {
+            return KEY_SYSTEM_NAV_2BUTTONS;
+        } else {
+            return KEY_SYSTEM_NAV_3BUTTONS;
+        }
+    }
+
+    @VisibleForTesting
+    static void setCurrentSystemNavigationMode(IOverlayManager overlayManager, String key) {
+        switch (key) {
+            case KEY_SYSTEM_NAV_GESTURAL:
+                setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY);
+                break;
+            case KEY_SYSTEM_NAV_2BUTTONS:
+                setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY);
+                break;
+            case KEY_SYSTEM_NAV_3BUTTONS:
+                setNavBarInteractionMode(overlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);
+                break;
+        }
+    }
+
+    /**
+     * Enables the specified overlay package.
+     */
+    static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
+        try {
+            overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    static void setIllustrationVideo(VideoPreference videoPref, String systemNavKey) {
+        videoPref.setVideo(0, 0);
+        switch (systemNavKey) {
+            case KEY_SYSTEM_NAV_GESTURAL:
+                videoPref.setVideo(R.raw.system_nav_fully_gestural,
+                        R.drawable.system_nav_fully_gestural);
+                break;
+            case KEY_SYSTEM_NAV_2BUTTONS:
+                videoPref.setVideo(R.raw.system_nav_2_button, R.drawable.system_nav_2_button);
+                break;
+            case KEY_SYSTEM_NAV_3BUTTONS:
+                videoPref.setVideo(R.raw.system_nav_3_button, R.drawable.system_nav_3_button);
+                break;
+        }
+    }
+
+    @Override
+    public void bindPreferenceExtra(RadioButtonPreference pref,
+            String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
+        if (info instanceof NavModeCandidateInfo) {
+            pref.setSummary(((NavModeCandidateInfo) info).loadSummary());
+            pref.setAppendixVisibility(View.GONE);
+        }
+    }
+
+    static class NavModeCandidateInfo extends CandidateInfo {
+        private final CharSequence mLabel;
+        private final CharSequence mSummary;
+        private final String mKey;
+
+        NavModeCandidateInfo(CharSequence label, CharSequence summary, String key,
+                boolean enabled) {
+            super(enabled);
+            mLabel = label;
+            mSummary = summary;
+            mKey = key;
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return mLabel;
+        }
+
+        public CharSequence loadSummary() {
+            return mSummary;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return null;
+        }
+
+        @Override
+        public String getKey() {
+            return mKey;
+        }
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
diff --git a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
deleted file mode 100644
index 7ac9a03..0000000
--- a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationLegacyPreferenceController extends
-        SystemNavigationPreferenceController {
-    static final String PREF_KEY_LEGACY = "gesture_legacy";
-
-    public SystemNavigationLegacyPreferenceController(Context context, String key) {
-        this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
-                Context.OVERLAY_SERVICE)), key);
-    }
-
-    @VisibleForTesting
-    public SystemNavigationLegacyPreferenceController(Context context,
-            IOverlayManager overlayManager, String key) {
-        super(context, overlayManager, key, NAV_BAR_MODE_3BUTTON_OVERLAY);
-    }
-
-    @Override
-    public void onRadioButtonClicked(RadioButtonPreference preference) {
-        setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);
-        selectRadioButtonInGroup(PREF_KEY_LEGACY, mPreferenceScreen);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return !isEdgeToEdgeEnabled(mContext) && !isSwipeUpEnabled(mContext);
-    }
-}
diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
index 664e7bb..d0d8155 100644
--- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
+++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -16,79 +16,29 @@
 
 package com.android.settings.gestures;
 
-import static android.os.UserHandle.USER_CURRENT;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.om.IOverlayManager;
 import android.content.pm.PackageManager;
-import android.os.RemoteException;
-import android.text.TextUtils;
-import android.view.View;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.core.BasePreferenceController;
 
-public abstract class SystemNavigationPreferenceController extends GesturePreferenceController
-        implements RadioButtonPreference.OnClickListener {
+public class SystemNavigationPreferenceController extends BasePreferenceController {
 
+    static final String PREF_KEY_SYSTEM_NAVIGATION = "gesture_system_navigation";
     private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-    private static final String PREF_KEY_VIDEO = "gesture_swipe_up_video";
 
-    private static final String[] RADIO_BUTTONS_IN_GROUP = {
-            SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY,
-            SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP,
-            SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE,
-    };
-
-    protected final IOverlayManager mOverlayManager;
-    protected PreferenceScreen mPreferenceScreen;
-    private final String mOverlayPackage;
-
-    public SystemNavigationPreferenceController(Context context, IOverlayManager overlayManager,
-            String key, String overlayPackage) {
+    public SystemNavigationPreferenceController(Context context, String key) {
         super(context, key);
-        mOverlayManager = overlayManager;
-        mOverlayPackage = overlayPackage;
     }
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext, mOverlayPackage) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreferenceScreen = screen;
-
-        Preference preference = screen.findPreference(getPreferenceKey());
-        if (preference != null && preference instanceof RadioButtonPreference) {
-            RadioButtonPreference radioPreference = (RadioButtonPreference) preference;
-            radioPreference.setOnClickListener(this);
-            radioPreference.setAppendixVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        if (!isChecked || mPreferenceScreen == null) {
-            return false;
-        }
-        Preference preference = mPreferenceScreen.findPreference(getPreferenceKey());
-        if (preference != null && preference instanceof RadioButtonPreference) {
-            onRadioButtonClicked((RadioButtonPreference) preference);
-        }
-        return true;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -102,17 +52,7 @@
         }
     }
 
-    @Override
-    protected String getVideoPrefKey() {
-        return PREF_KEY_VIDEO;
-    }
-
-
     static boolean isGestureAvailable(Context context) {
-        return isGestureAvailable(context, null /* overlayPackage */);
-    }
-
-    static boolean isGestureAvailable(Context context, String overlayPackage) {
         // Skip if the swipe up settings are not available
         if (!context.getResources().getBoolean(
                 com.android.internal.R.bool.config_swipe_up_gesture_setting_available)) {
@@ -127,44 +67,22 @@
         }
 
         // Skip if the overview proxy service exists
-        final PackageManager pm = context.getPackageManager();
         final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
                 .setPackage(recentsComponentName.getPackageName());
-        if (pm.resolveService(quickStepIntent, PackageManager.MATCH_SYSTEM_ONLY) == null) {
+        if (context.getPackageManager().resolveService(quickStepIntent,
+                PackageManager.MATCH_SYSTEM_ONLY) == null) {
             return false;
         }
 
-        // Skip if the required overlay package is defined but doesn't exist
-        if (overlayPackage != null) {
-            try {
-                return pm.getPackageInfo(overlayPackage, 0 /* flags */) != null;
-            } catch (PackageManager.NameNotFoundException e) {
-                // Not found, just return unavailable
-                return false;
-            }
-        }
-
         return true;
     }
 
-    static void selectRadioButtonInGroup(String preferenceKey, PreferenceScreen screen) {
-        if (screen == null) {
-            return;
-        }
-        for (String key : RADIO_BUTTONS_IN_GROUP) {
-            ((RadioButtonPreference) screen.findPreference(key)).setChecked(
-                    TextUtils.equals(key, preferenceKey));
-        }
-    }
-
-    /**
-     * Enables the specified overlay package.
-     */
-    static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
+    static boolean isOverlayPackageAvailable(Context context, String overlayPackage) {
         try {
-            overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return context.getPackageManager().getPackageInfo(overlayPackage, 0) != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            // Not found, just return unavailable
+            return false;
         }
     }
 
diff --git a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
deleted file mode 100644
index 592b231..0000000
--- a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.os.ServiceManager;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.widget.RadioButtonPreference;
-
-public class SystemNavigationSwipeUpPreferenceController extends
-        SystemNavigationPreferenceController {
-    static final String PREF_KEY_SWIPE_UP = "gesture_swipe_up";
-
-    public SystemNavigationSwipeUpPreferenceController(Context context, String key) {
-        this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
-                Context.OVERLAY_SERVICE)), key);
-    }
-
-    @VisibleForTesting
-    public SystemNavigationSwipeUpPreferenceController(Context context,
-            IOverlayManager overlayManager, String key) {
-        super(context, overlayManager, key, NAV_BAR_MODE_2BUTTON_OVERLAY);
-    }
-
-    @Override
-    public void onRadioButtonClicked(RadioButtonPreference preference) {
-        setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY);
-        selectRadioButtonInGroup(PREF_KEY_SWIPE_UP, mPreferenceScreen);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return isSwipeUpEnabled(mContext);
-    }
-}
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index e767664..fa23101 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -27,16 +27,16 @@
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.android.settings.R;
 import com.android.settings.accounts.AvatarViewMixin;
-import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
 import com.android.settings.overlay.FeatureFactory;
 
-public class SettingsHomepageActivity extends SettingsBaseActivity {
+public class SettingsHomepageActivity extends FragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index a50cf41..6d3649d 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -146,10 +146,6 @@
                     FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
             metricsFeatureProvider.action(mContext,
-                    SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
-                    ContextualCardLogUtils.buildCardListLog(visibleCards));
-
-            metricsFeatureProvider.action(mContext,
                     SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,
                     ContextualCardLogUtils.buildCardListLog(hiddenCards));
         }
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
index b39058b..a941fdb 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
@@ -38,6 +38,7 @@
 import androidx.loader.content.Loader;
 
 import com.android.settings.homepage.contextualcards.conditional.ConditionalCardController;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
 import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -208,19 +209,26 @@
 
         final List<ContextualCard> cardsToKeep = getCardsToKeep(cards);
 
+        final MetricsFeatureProvider metricsFeatureProvider =
+                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
         //navigate back to the homepage, screen rotate or after card dismissal
         if (!mIsFirstLaunch) {
             onContextualCardUpdated(cardsToKeep.stream()
                     .collect(groupingBy(ContextualCard::getCardType)));
+            metricsFeatureProvider.action(mContext,
+                    SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
+                    ContextualCardLogUtils.buildCardListLog(cardsToKeep));
             return;
         }
 
-        final MetricsFeatureProvider metricsFeatureProvider =
-                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
         final long timeoutLimit = getCardLoaderTimeout();
         if (loadTime <= timeoutLimit) {
             onContextualCardUpdated(cards.stream()
                     .collect(groupingBy(ContextualCard::getCardType)));
+            metricsFeatureProvider.action(mContext,
+                    SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
+                    ContextualCardLogUtils.buildCardListLog(cards));
         } else {
             // log timeout occurrence
             metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
index 0704ed8..92892b3 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -33,12 +33,11 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.wifi.slice.ContextualWifiScanWorker;
 
 public class ContextualCardsFragment extends InstrumentedFragment implements
         FocusRecyclerView.FocusListener {
 
-    private static final String TAG = "ContextualCardsFragment";
-
     private FocusRecyclerView mCardsContainer;
     private GridLayoutManager mLayoutManager;
     private ContextualCardsAdapter mContextualCardsAdapter;
@@ -60,6 +59,7 @@
     @Override
     public void onStart() {
         super.onStart();
+        ContextualWifiScanWorker.newVisibleUiSession();
         mContextualCardManager.loadContextualCards(LoaderManager.getInstance(this));
     }
 
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 6871428..7142486 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -33,7 +33,7 @@
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.location.RecentLocationAccesses;
+import com.android.settingslib.location.RecentLocationApps;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -50,7 +50,7 @@
  *         <li>In switch bar: location master switch. Used to toggle location on and off.
  *         </li>
  *     </ul>
- *     <li>Recent location requests: automatically populated by {@link RecentLocationAccesses}</li>
+ *     <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>
  *     <li>Location services: multi-app settings provided from outside the Android framework. Each
  *     is injected by a system-partition app via the {@link SettingInjectorService} API.</li>
  * </ul>
@@ -118,7 +118,7 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new AppLocationPermissionPreferenceController(context, lifecycle));
         controllers.add(new LocationForWorkPreferenceController(context, lifecycle));
-        controllers.add(new RecentLocationAccessPreferenceController(context));
+        controllers.add(new RecentLocationRequestPreferenceController(context, fragment, lifecycle));
         controllers.add(new LocationScanningPreferenceController(context));
         controllers.add(new LocationServicePreferenceController(context, fragment, lifecycle));
         controllers.add(new LocationFooterPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
new file mode 100644
index 0000000..fb8c62c
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -0,0 +1,145 @@
+/*
+ * 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.location;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+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.applications.appinfo.AppInfoDashboardFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
+import java.util.List;
+
+public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController {
+    /** Key for preference category "Recent location requests" */
+    private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
+    @VisibleForTesting
+    static final String KEY_SEE_ALL_BUTTON = "recent_location_requests_see_all_button";
+    private final LocationSettings mFragment;
+    private final RecentLocationApps mRecentLocationApps;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+
+    /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController} */
+    static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener {
+        private final DashboardFragment mFragment;
+        private final String mPackage;
+        private final UserHandle mUserHandle;
+
+        public PackageEntryClickedListener(DashboardFragment fragment, String packageName,
+                UserHandle userHandle) {
+            mFragment = fragment;
+            mPackage = packageName;
+            mUserHandle = userHandle;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            final Bundle args = new Bundle();
+            args.putString(AppInfoDashboardFragment.ARG_PACKAGE_NAME, mPackage);
+            new SubSettingLauncher(mFragment.getContext())
+                    .setDestination(AppInfoDashboardFragment.class.getName())
+                    .setArguments(args)
+                    .setTitleRes(R.string.application_info_label)
+                    .setUserHandle(mUserHandle)
+                    .setSourceMetricsCategory(mFragment.getMetricsCategory())
+                    .launch();
+            return true;
+        }
+    }
+
+    public RecentLocationRequestPreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle) {
+        this(context, fragment, lifecycle, new RecentLocationApps(context));
+    }
+
+    @VisibleForTesting
+    RecentLocationRequestPreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle, RecentLocationApps recentApps) {
+        super(context, lifecycle);
+        mFragment = fragment;
+        mRecentLocationApps = recentApps;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_RECENT_LOCATION_REQUESTS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategoryRecentLocationRequests =
+                (PreferenceCategory) screen.findPreference(KEY_RECENT_LOCATION_REQUESTS);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mCategoryRecentLocationRequests.removeAll();
+        final Context prefContext = preference.getContext();
+        final List<RecentLocationApps.Request> recentLocationRequests =
+                mRecentLocationApps.getAppListSorted(false);
+        if (recentLocationRequests.size() > 3) {
+            // Display the top 3 preferences to container in original order.
+            for (int i = 0; i < 3; i++) {
+                mCategoryRecentLocationRequests.addPreference(
+                        createAppPreference(prefContext, recentLocationRequests.get(i)));
+            }
+        } else if (recentLocationRequests.size() > 0) {
+            // Add preferences to container in original order (already sorted by recency).
+            for (RecentLocationApps.Request request : recentLocationRequests) {
+                mCategoryRecentLocationRequests.addPreference(
+                        createAppPreference(prefContext, request));
+            }
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = createAppPreference(prefContext);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mCategoryRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+
+    @VisibleForTesting
+    AppPreference createAppPreference(Context prefContext) {
+        return new AppPreference(prefContext);
+    }
+
+    @VisibleForTesting
+    AppPreference createAppPreference(Context prefContext, RecentLocationApps.Request request) {
+        final AppPreference pref = createAppPreference(prefContext);
+        pref.setSummary(request.contentDescription);
+        pref.setIcon(request.icon);
+        pref.setTitle(request.label);
+        pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
+                mFragment, request.packageName, request.userHandle));
+        return pref;
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java
new file mode 100644
index 0000000..9e4a77f
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/** Dashboard Fragment to display all recent location requests, sorted by recency. */
+@SearchIndexable
+public class RecentLocationRequestSeeAllFragment extends DashboardFragment {
+    private static final String TAG = "RecentLocationReqAll";
+    public static final String PATH =
+            "com.android.settings.location.RecentLocationRequestSeeAllFragment";
+
+    private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1;
+    private static final int MENU_HIDE_SYSTEM = Menu.FIRST + 2;
+
+    private boolean mShowSystem = false;
+    private MenuItem mShowSystemMenu;
+    private MenuItem mHideSystemMenu;
+    private RecentLocationRequestSeeAllPreferenceController mController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.RECENT_LOCATION_REQUESTS_ALL;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_recent_requests_see_all;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getSettingsLifecycle(), this);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case MENU_SHOW_SYSTEM:
+            case MENU_HIDE_SYSTEM:
+                mShowSystem = menuItem.getItemId() == MENU_SHOW_SYSTEM;
+                updateMenu();
+                if (mController != null) {
+                    mController.setShowSystem(mShowSystem);
+                }
+                return true;
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
+    }
+
+    private void updateMenu() {
+        mShowSystemMenu.setVisible(!mShowSystem);
+        mHideSystemMenu.setVisible(mShowSystem);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
+            Context context, Lifecycle lifecycle, RecentLocationRequestSeeAllFragment fragment) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final RecentLocationRequestSeeAllPreferenceController controller =
+                new RecentLocationRequestSeeAllPreferenceController(context, lifecycle, fragment);
+        controllers.add(controller);
+        if (fragment != null) {
+            fragment.mController = controller;
+        }
+        return controllers;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.location_recent_requests_see_all;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(
+                            context, /* lifecycle = */ null, /* fragment = */ null);
+                }
+            };
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        mShowSystemMenu = menu.add(Menu.NONE, MENU_SHOW_SYSTEM, Menu.NONE,
+                R.string.menu_show_system);
+        mHideSystemMenu = menu.add(Menu.NONE, MENU_HIDE_SYSTEM, Menu.NONE,
+                R.string.menu_hide_system);
+        updateMenu();
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
new file mode 100644
index 0000000..3abccf7
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
+import java.util.List;
+
+import com.android.settings.R;
+
+/** Preference controller for preference category displaying all recent location requests. */
+public class RecentLocationRequestSeeAllPreferenceController
+        extends LocationBasePreferenceController {
+    /** Key for preference category "All recent location requests" */
+    private static final String KEY_ALL_RECENT_LOCATION_REQUESTS = "all_recent_location_requests";
+    private final RecentLocationRequestSeeAllFragment mFragment;
+    private PreferenceCategory mCategoryAllRecentLocationRequests;
+    private RecentLocationApps mRecentLocationApps;
+    private boolean mShowSystem = false;
+    private Preference mPreference;
+
+    public RecentLocationRequestSeeAllPreferenceController(
+            Context context, Lifecycle lifecycle, RecentLocationRequestSeeAllFragment fragment) {
+        this(context, lifecycle, fragment, new RecentLocationApps(context));
+    }
+
+    @VisibleForTesting
+    RecentLocationRequestSeeAllPreferenceController(
+            Context context,
+            Lifecycle lifecycle,
+            RecentLocationRequestSeeAllFragment fragment,
+            RecentLocationApps recentLocationApps) {
+        super(context, lifecycle);
+        mFragment = fragment;
+        mRecentLocationApps = recentLocationApps;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ALL_RECENT_LOCATION_REQUESTS;
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mCategoryAllRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategoryAllRecentLocationRequests =
+                (PreferenceCategory) screen.findPreference(KEY_ALL_RECENT_LOCATION_REQUESTS);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mCategoryAllRecentLocationRequests.removeAll();
+        mPreference = preference;
+        List<RecentLocationApps.Request> requests = mRecentLocationApps.getAppListSorted(
+                mShowSystem);
+        if (requests.isEmpty()) {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = new AppPreference(mContext);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryAllRecentLocationRequests.addPreference(banner);
+        } else {
+            for (RecentLocationApps.Request request : requests) {
+                Preference appPreference = createAppPreference(preference.getContext(), request);
+                mCategoryAllRecentLocationRequests.addPreference(appPreference);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    AppPreference createAppPreference(
+            Context prefContext, RecentLocationApps.Request request) {
+        final AppPreference pref = new AppPreference(prefContext);
+        pref.setSummary(request.contentDescription);
+        pref.setIcon(request.icon);
+        pref.setTitle(request.label);
+        pref.setOnPreferenceClickListener(
+                new RecentLocationRequestPreferenceController.PackageEntryClickedListener(
+                        mFragment, request.packageName, request.userHandle));
+        return pref;
+    }
+
+    public void setShowSystem(boolean showSystem) {
+        mShowSystem = showSystem;
+        if (mPreference != null) {
+            updateState(mPreference);
+        }
+    }
+}
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index dec50bc..0ffa9ff 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.core.graphics.drawable.IconCompat;
@@ -113,9 +114,14 @@
 
     private boolean isVisible() {
         // To decide Slice's visibility.
-        // return true if device is connected or previously connected, false for other cases.
-        return !CollectionUtils.isEmpty(getConnectedA2dpDevices())
-                || !CollectionUtils.isEmpty(getConnectedHearingAidDevices());
+        // Return true if
+        // 1. phone is not in ongoing call mode
+        // 2. Bluetooth device is connected
+        final TelephonyManager telephonyManager =
+                (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+        return telephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE
+                && (!CollectionUtils.isEmpty(getConnectedA2dpDevices())
+                || !CollectionUtils.isEmpty(getConnectedHearingAidDevices()));
     }
 
     private List<BluetoothDevice> getConnectedA2dpDevices() {
diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
index 2d10fd3..0937d4b 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
@@ -78,4 +78,9 @@
             notifySliceChange();
         }
     }
+
+    @Override
+    public void onAudioModeChanged() {
+        notifySliceChange();
+    }
 }
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index 9fdb6ea..98c1f5b 100644
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -65,8 +65,11 @@
         final boolean isGsmApn = MobileNetworkUtils.isGsmOptions(mContext, subId)
                 && carrierConfig != null
                 && carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL);
+        final boolean hideCarrierNetwork = carrierConfig == null
+                || carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL);
 
-        return isCdmaApn || isGsmApn
+        return !hideCarrierNetwork && (isCdmaApn || isGsmApn)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 939598b..0c099ca 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -80,12 +80,16 @@
     }
 
     /**
-     * Returns true if Wifi calling is enabled for at least one phone.
+     * Returns true if Wifi calling is enabled for at least one subscription.
      */
     public static boolean isWifiCallingEnabled(Context context) {
-        int phoneCount = context.getSystemService(TelephonyManager.class).getPhoneCount();
-        for (int i = 0; i < phoneCount; i++) {
-            if (isWifiCallingEnabled(context, i)) {
+        SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
+        if (subManager == null) {
+            Log.e(TAG, "isWifiCallingEnabled: couldn't get system service.");
+            return false;
+        }
+        for (int subId : subManager.getActiveSubscriptionIdList()) {
+            if (isWifiCallingEnabled(context, subId)) {
                 return true;
             }
         }
@@ -93,11 +97,12 @@
     }
 
     /**
-     * Returns true if Wifi calling is enabled for the specific phone with id {@code phoneId}.
+     * Returns true if Wifi calling is enabled for the specific subscription with id {@code subId}.
      */
-    public static boolean isWifiCallingEnabled(Context context, int phoneId) {
+    public static boolean isWifiCallingEnabled(Context context, int subId) {
         final PhoneAccountHandle simCallManager =
-                TelecomManager.from(context).getSimCallManager();
+                TelecomManager.from(context).getSimCallManagerForSubscription(subId);
+        final int phoneId = SubscriptionManager.getSlotIndex(subId);
 
         boolean isWifiCallingEnabled;
         if (simCallManager != null) {
@@ -350,6 +355,8 @@
                 || carrierConfig == null
                 || !carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)
+                || carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
                 || (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)
                 && !telephonyManager.isManualNetworkSelectionAllowed())) {
             return false;
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index 8c32df0..1c78863 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -63,8 +63,7 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
-                && MobileNetworkUtils.isWifiCallingEnabled(mContext,
-                SubscriptionManager.getPhoneId(subId))
+                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId)
                 && isVideoCallEnabled(subId)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 946f741..c71ee35 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -68,7 +68,6 @@
         super(context, key);
         mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
         mTelephonyManager = context.getSystemService(TelephonyManager.class);
-        mSimCallManager = context.getSystemService(TelecomManager.class).getSimCallManager();
         mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper());
         mEditableWfcRoamingMode = true;
         mUseWfcHomeModeForRoaming = false;
@@ -77,8 +76,7 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
-                && MobileNetworkUtils.isWifiCallingEnabled(mContext,
-                SubscriptionManager.getPhoneId(subId))
+                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
@@ -155,6 +153,8 @@
         mSubId = subId;
         mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
         mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));
+        mSimCallManager = mContext.getSystemService(TelecomManager.class)
+                .getSimCallManagerForSubscription(mSubId);
         if (mCarrierConfigManager != null) {
             final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
             if (carrierConfig != null) {
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index adfb1d8..56d0b2d 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -52,7 +52,6 @@
     private static final long MINIMUM_DIALOG_TIME_MILLIS = TimeUnit.SECONDS.toMillis(1);
 
     private final Handler mUiHandler;
-    private int mSubId;
     private TelephonyManager mTelephonyManager;
     private boolean mOnlyAutoSelectInHome;
     private List<OnNetworkSelectModeListener> mListeners;
diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
index 9ac0d12..46171bc 100644
--- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
@@ -42,7 +42,6 @@
         TelephonyBasePreferenceController implements
         AutoSelectPreferenceController.OnNetworkSelectModeListener {
 
-    private int mSubId;
     private TelephonyManager mTelephonyManager;
     private Preference mPreference;
 
diff --git a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
deleted file mode 100644
index 83e73e9..0000000
--- a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-public class BubbleNotificationPreferenceController extends TogglePreferenceController
-        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
-        LifecycleObserver, OnResume, OnPause {
-
-    private static final String TAG = "BubbleNotifPrefContr";
-    @VisibleForTesting
-    static final int ON = 1;
-    @VisibleForTesting
-    static final int OFF = 0;
-
-    private SettingObserver mSettingObserver;
-
-    public BubbleNotificationPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        Preference preference = screen.findPreference(getPreferenceKey());
-        if (preference != null) {
-            mSettingObserver = new SettingObserver(preference);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        if (mSettingObserver != null) {
-            mSettingObserver.register(mContext.getContentResolver(), true /* register */);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        if (mSettingObserver != null) {
-            mSettingObserver.register(mContext.getContentResolver(), false /* register */);
-        }
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, ON) == ON;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        return Settings.Secure.putInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, isChecked ? ON : OFF);
-    }
-
-    class SettingObserver extends ContentObserver {
-
-        private final Uri NOTIFICATION_BUBBLES_URI =
-                Settings.Secure.getUriFor(NOTIFICATION_BUBBLES);
-
-        private final Preference mPreference;
-
-        public SettingObserver(Preference preference) {
-            super(new Handler());
-            mPreference = preference;
-        }
-
-        public void register(ContentResolver cr, boolean register) {
-            if (register) {
-                cr.registerContentObserver(NOTIFICATION_BUBBLES_URI, false, this);
-            } else {
-                cr.unregisterContentObserver(this);
-            }
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            if (NOTIFICATION_BUBBLES_URI.equals(uri)) {
-                updateState(mPreference);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/notification/BubbleNotificationSettings.java b/src/com/android/settings/notification/BubbleNotificationSettings.java
deleted file mode 100644
index 7044293..0000000
--- a/src/com/android/settings/notification/BubbleNotificationSettings.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.core.OnActivityResultListener;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.Arrays;
-import java.util.List;
-
-@SearchIndexable
-public class BubbleNotificationSettings extends DashboardFragment implements
-        OnActivityResultListener {
-    private static final String TAG = "BubbleNotiSettings";
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.BUBBLE_SETTINGS;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.bubble_notification_settings;
-    }
-
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(
-                        Context context, boolean enabled) {
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.bubble_notification_settings;
-                    return Arrays.asList(sir);
-                }
-            };
-}
diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java
index f373752..200c4b2 100644
--- a/src/com/android/settings/notification/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/BubblePreferenceController.java
@@ -25,6 +25,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedSwitchPreference;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 
@@ -33,8 +34,10 @@
 
     private static final String TAG = "BubblePrefContr";
     private static final String KEY = "bubble_pref";
-    private static final int SYSTEM_WIDE_ON = 1;
-    private static final int SYSTEM_WIDE_OFF = 0;
+    @VisibleForTesting
+    static final int SYSTEM_WIDE_ON = 1;
+    @VisibleForTesting
+    static final int SYSTEM_WIDE_OFF = 0;
 
     private FragmentManager mFragmentManager;
 
@@ -58,18 +61,14 @@
         if (!super.isAvailable()) {
             return false;
         }
-        if (mAppRow == null && mChannel == null) {
+        if (!isGloballyEnabled()) {
             return false;
         }
         if (mChannel != null) {
-            if (Settings.Secure.getInt(mContext.getContentResolver(),
-                    NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) {
-                return false;
-            }
             if (isDefaultChannel()) {
                 return true;
             } else {
-                return mAppRow == null ? false : mAppRow.allowBubbles;
+                return mAppRow != null && mAppRow.allowBubbles;
             }
         }
         return true;
@@ -80,12 +79,10 @@
             RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
             pref.setDisabledByAdmin(mAdmin);
             if (mChannel != null) {
-                pref.setChecked(mChannel.canBubble());
+                pref.setChecked(mChannel.canBubble() && isGloballyEnabled());
                 pref.setEnabled(!pref.isDisabledByAdmin());
             } else {
-                pref.setChecked(mAppRow.allowBubbles
-                        && Settings.Secure.getInt(mContext.getContentResolver(),
-                        NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON) == SYSTEM_WIDE_ON);
+                pref.setChecked(mAppRow.allowBubbles && isGloballyEnabled());
                 pref.setSummary(mContext.getString(
                         R.string.bubbles_app_toggle_summary, mAppRow.label));
             }
@@ -94,7 +91,7 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean value = (Boolean) newValue;
+        final boolean value = (Boolean) newValue && isGloballyEnabled();
         if (mChannel != null) {
             mChannel.setAllowBubbles(value);
             saveChannel();
@@ -103,9 +100,7 @@
             RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
             // if the global setting is off, toggling app level permission requires extra
             // confirmation
-            if (Settings.Secure.getInt(mContext.getContentResolver(),
-                    NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF
-                    && !pref.isChecked()) {
+            if (!isGloballyEnabled() && !pref.isChecked()) {
                 new BubbleWarningDialogFragment()
                         .setPkgInfo(mAppRow.pkg, mAppRow.uid)
                         .show(mFragmentManager, "dialog");
@@ -118,6 +113,11 @@
         return true;
     }
 
+    private boolean isGloballyEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
+    }
+
     // Used in app level prompt that confirms the user is ok with turning on bubbles
     // globally. If they aren't, undo what
     public static void revertBubblesApproval(Context mContext, String pkg, int uid) {
diff --git a/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
deleted file mode 100644
index e26d9a8..0000000
--- a/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-
-import androidx.annotation.VisibleForTesting;
-
-public class BubbleSummaryNotificationPreferenceController extends BasePreferenceController {
-
-    @VisibleForTesting
-    static final int ON = 1;
-
-    public BubbleSummaryNotificationPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        return mContext.getString(
-                areBubblesEnabled() ? R.string.switch_on_text : R.string.switch_off_text);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    private boolean areBubblesEnabled() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, ON) == ON;
-    }
-}
diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
index 5f58f67..b1632c4 100644
--- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
@@ -27,13 +27,16 @@
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
 public class BubbleSummaryPreferenceController extends NotificationPreferenceController {
 
     private static final String KEY = "bubble_link_pref";
-    private static final int SYSTEM_WIDE_ON = 1;
-    private static final int SYSTEM_WIDE_OFF = 0;
+    @VisibleForTesting
+    static final int SYSTEM_WIDE_ON = 1;
+    @VisibleForTesting
+    static final int SYSTEM_WIDE_OFF = 0;
 
     public BubbleSummaryPreferenceController(Context context, NotificationBackend backend) {
         super(context, backend);
@@ -53,17 +56,16 @@
             return false;
         }
         if (mChannel != null) {
-            if (Settings.Secure.getInt(mContext.getContentResolver(),
-                    NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) {
+            if (!isGloballyEnabled()) {
                 return false;
             }
             if (isDefaultChannel()) {
                 return true;
             } else {
-                return mAppRow == null ? false : mAppRow.allowBubbles;
+                return mAppRow != null && mAppRow.allowBubbles;
             }
         }
-        return true;
+        return isGloballyEnabled();
     }
 
     @Override
@@ -89,13 +91,16 @@
         boolean canBubble = false;
         if (mAppRow != null) {
             if (mChannel != null) {
-                canBubble |= mChannel.canBubble();
+               canBubble |= mChannel.canBubble() && isGloballyEnabled();
             } else {
-               canBubble |= mAppRow.allowBubbles
-                       && (Settings.Secure.getInt(mContext.getContentResolver(),
-                       NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON) == SYSTEM_WIDE_ON);
+               canBubble |= mAppRow.allowBubbles && isGloballyEnabled();
             }
         }
         return mContext.getString(canBubble ? R.string.switch_on_text : R.string.switch_off_text);
     }
+
+    private boolean isGloballyEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
+    }
 }
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index 1fe7e7d..d5e1723 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -79,7 +79,6 @@
     private final PackageManager mPm;
     private final NotificationBackend mNotificationBackend;
     private IUsageStatsManager mUsageStatsManager;
-    private final int mUserId;
     private final IconDrawableFactory mIconDrawableFactory;
 
     private Calendar mCal;
@@ -104,7 +103,6 @@
             ApplicationsState appState, Fragment host) {
         super(context);
         mIconDrawableFactory = IconDrawableFactory.newInstance(context);
-        mUserId = UserHandle.myUserId();
         mPm = context.getPackageManager();
         mHost = host;
         mApplicationsState = appState;
@@ -177,7 +175,6 @@
                 e.printStackTrace();
             }
             if (events != null) {
-
                 ArrayMap<String, NotifyingApp> aggregatedStats = new ArrayMap<>();
 
                 UsageEvents.Event event = new UsageEvents.Event();
@@ -205,7 +202,8 @@
         }
     }
 
-    private static String getKey(int userId, String pkg) {
+    @VisibleForTesting
+    static String getKey(int userId, String pkg) {
         return userId + "|" + pkg;
     }
 
@@ -252,12 +250,13 @@
             }
 
             boolean rebindPref = true;
-            NotificationAppPreference pref = appPreferences.remove(pkgName);
+            NotificationAppPreference pref = appPreferences.remove(getKey(app.getUserId(),
+                    pkgName));
             if (pref == null) {
                 pref = new NotificationAppPreference(prefContext);
                 rebindPref = false;
             }
-            pref.setKey(pkgName);
+            pref.setKey(getKey(app.getUserId(), pkgName));
             pref.setTitle(appEntry.label);
             pref.setIcon(mIconDrawableFactory.getBadgedIcon(appEntry.info));
             pref.setIconSize(TwoTargetPreference.ICON_SIZE_SMALL);
@@ -267,11 +266,11 @@
             Bundle args = new Bundle();
             args.putString(AppInfoBase.ARG_PACKAGE_NAME, pkgName);
             args.putInt(AppInfoBase.ARG_PACKAGE_UID, appEntry.info.uid);
-
             pref.setIntent(new SubSettingLauncher(mHost.getActivity())
                     .setDestination(AppNotificationSettings.class.getName())
                     .setTitleRes(R.string.notifications_title)
                     .setArguments(args)
+                    .setUserHandle(new UserHandle(UserHandle.getUserId(appEntry.info.uid)))
                     .setSourceMetricsCategory(
                             SettingsEnums.MANAGE_APPLICATIONS_NOTIFICATIONS)
                     .toIntent());
@@ -301,11 +300,11 @@
         int count = 0;
         for (NotifyingApp app : mApps) {
             final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(
-                    app.getPackage(), mUserId);
+                    app.getPackage(), app.getUserId());
             if (appEntry == null) {
                 continue;
             }
-            if (!shouldIncludePkgInRecents(app.getPackage())) {
+            if (!shouldIncludePkgInRecents(app.getPackage(), app.getUserId())) {
                 continue;
             }
             displayableApps.add(app);
@@ -321,14 +320,14 @@
     /**
      * Whether or not the app should be included in recent list.
      */
-    private boolean shouldIncludePkgInRecents(String pkgName) {
+    private boolean shouldIncludePkgInRecents(String pkgName, int userId) {
         final Intent launchIntent = new Intent().addCategory(Intent.CATEGORY_LAUNCHER)
                 .setPackage(pkgName);
 
         if (mPm.resolveActivity(launchIntent, 0) == null) {
             // Not visible on launcher -> likely not a user visible app, skip if non-instant.
             final ApplicationsState.AppEntry appEntry =
-                    mApplicationsState.getEntry(pkgName, mUserId);
+                    mApplicationsState.getEntry(pkgName, userId);
             if (appEntry == null || appEntry.info == null || !AppUtils.isInstant(appEntry.info)) {
                 Log.d(TAG, "Not a user visible or instant app, skipping " + pkgName);
                 return false;
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 74ccf59..14f99f3 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -33,7 +33,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -74,12 +73,12 @@
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
     /**
      * Create an intent for launching RedactionInterstitial.
+     *
      * @return An intent to launch the activity is if is available, @null if the activity is not
      * available to be launched.
      */
@@ -87,8 +86,8 @@
         return new Intent(ctx, RedactionInterstitial.class)
                 .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID,
                         UserManager.get(ctx).isManagedProfile(userId)
-                            ? R.string.lock_screen_notifications_interstitial_title_profile
-                            : R.string.lock_screen_notifications_interstitial_title)
+                                ? R.string.lock_screen_notifications_interstitial_title_profile
+                                : R.string.lock_screen_notifications_interstitial_title)
                 .putExtra(Intent.EXTRA_USER_ID, userId);
     }
 
@@ -160,7 +159,7 @@
 
             checkNotificationFeaturesAndSetDisabled(mShowAllButton,
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS |
-                    KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
+                            KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
             checkNotificationFeaturesAndSetDisabled(mRedactSensitiveButton,
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
             loadFromSettings();
diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java
index a2cb277..749a46e 100644
--- a/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -18,13 +18,10 @@
 
 import static com.android.settingslib.media.MediaOutputSliceConstants.EXTRA_PACKAGE_NAME;
 
-import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.MotionEvent;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -35,8 +32,6 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.panel.PanelLoggingContract.PanelClosedKeys;
 
 /**
  * Dialog Activity to host Settings Slices.
@@ -66,17 +61,17 @@
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        showOrUpdatePanel();
+        createOrUpdatePanel(true /* shouldForceCreation */);
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
-        showOrUpdatePanel();
+        createOrUpdatePanel(false /* shouldForceCreation */);
     }
 
-    private void showOrUpdatePanel() {
+    private void createOrUpdatePanel(boolean shouldForceCreation) {
         final Intent callingIntent = getIntent();
         if (callingIntent == null) {
             Log.e(TAG, "Null intent, closing Panel Activity");
@@ -95,7 +90,7 @@
         final Fragment fragment = fragmentManager.findFragmentById(R.id.main_content);
 
         // If fragment already exists, we will need to update panel with animation.
-        if (fragment != null && fragment instanceof PanelFragment) {
+        if (!shouldForceCreation && fragment != null && fragment instanceof PanelFragment) {
             final PanelFragment panelFragment = (PanelFragment) fragment;
             panelFragment.setArguments(mBundle);
             ((PanelFragment) fragment).updatePanelWithAnimation();
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 8677e22..639dd6b 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -175,8 +175,7 @@
         }
 
         setTitle(msg);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index dd5e674..5de4e3a 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -163,8 +163,7 @@
         }
 
         setTitle(msg);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
     @Override
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index aa40d27..998b3fc 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -96,8 +96,7 @@
         if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {
             // Prevent the content parent from consuming the window insets because GlifLayout uses
             // it to show the status bar background.
-            LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-            layout.setFitsSystemWindows(false);
+            findViewById(R.id.content_parent).setFitsSystemWindows(false);
         }
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         mIsKeyguardLocked = savedState == null
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 8155a72..9a165297 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -93,8 +93,7 @@
             }
         }
 
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
     public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 05bb0b2..d24dbf5 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.sim;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.telecom.PhoneAccount;
@@ -44,11 +45,15 @@
 
     public static String PREFERRED_SIM = "preferred_sim";
     public static String DIALOG_TYPE_KEY = "dialog_type";
+    // sub ID returned from startActivityForResult
+    public static String RESULT_SUB_ID = "result_sub_id";
     public static final int INVALID_PICK = -1;
     public static final int DATA_PICK = 0;
     public static final int CALLS_PICK = 1;
     public static final int SMS_PICK = 2;
     public static final int PREFERRED_PICK = 3;
+    // Show the "select SMS subscription" dialog, but don't save as default, just return a result
+    public static final int SMS_PICK_FOR_MESSAGE = 4;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -94,6 +99,9 @@
                     throw new IllegalArgumentException("Missing required extra " + PREFERRED_SIM);
                 }
                 return PreferredSimDialogFragment.newInstance();
+            case SMS_PICK_FOR_MESSAGE:
+                return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
+                        false /* includeAskEveryTime */);
             default:
                 throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");
         }
@@ -117,6 +125,13 @@
             case PREFERRED_PICK:
                 setPreferredSim(subId);
                 break;
+            case SMS_PICK_FOR_MESSAGE:
+                // Don't set a default here.
+                // The caller has created this dialog waiting for a result.
+                Intent intent = new Intent();
+                intent.putExtra(RESULT_SUB_ID, subId);
+                setResult(Activity.RESULT_OK, intent);
+                break;
             default:
                 throw new IllegalArgumentException(
                         "Invalid dialog type " + dialogType + " sent.");
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index ae94f29..b649eb2 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -18,9 +18,9 @@
     /**
      * Starts a new UI session for the purpose of using Slices.
      *
-     * A UI session is defined as an duration of time when user stays in a UI screen. Screen
-     * rotation does not break the continuation of session, going to a sub-page and coming out does
-     * not break the continuation either. Leaving the page and coming back breaks it.
+     * A UI session is defined as a duration of time when user stays in a UI screen. Screen rotation
+     * does not break the continuation of session, going to a sub-page and coming out does not break
+     * the continuation either. Leaving the page and coming back breaks it.
      */
     void newUiSession();
 
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index 297f2c1..87d7401 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -24,8 +24,6 @@
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settingslib.utils.ThreadUtils;
 
-import java.util.Random;
-
 /**
  * Manages Slices in Settings.
  */
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index f8743d1..3341304 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -61,6 +61,16 @@
         void onSwitchChanged(Switch switchView, boolean isChecked);
     }
 
+    public interface LabelDelegate {
+        /**
+         * Called to create label and set the title with Accessibility
+         * service name to the textView of switchBar.
+         *
+         * @param isChecked  The checked state of switchView.
+         */
+        String createLabel(boolean isChecked);
+    }
+
     private static final int[] XML_ATTRIBUTES = {
             R.attr.switchBarMarginStart,
             R.attr.switchBarMarginEnd,
@@ -90,6 +100,7 @@
     private boolean mDisabledByAdmin;
     private EnforcedAdmin mEnforcedAdmin = null;
     private String mMetricsTag;
+    private LabelDelegate mLabelDelegate;
 
 
     public SwitchBar(Context context) {
@@ -178,7 +189,11 @@
     }
 
     public void setTextViewLabelAndBackground(boolean isChecked) {
-        mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
+        if(mLabelDelegate != null) {
+            mLabel = mLabelDelegate.createLabel(isChecked);
+        } else {
+            mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
+        }
         setBackgroundColor(isChecked ? mBackgroundActivatedColor : mBackgroundColor);
         updateText();
     }
@@ -383,4 +398,9 @@
 
         requestLayout();
     }
+
+    public void setLabelDelegate(LabelDelegate labelDelegate) {
+        mLabelDelegate = labelDelegate;
+        setTextViewLabelAndBackground(isChecked());
+    }
 }
diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java
index 7cef66f..505dc58 100644
--- a/src/com/android/settings/widget/UsageGraph.java
+++ b/src/com/android/settings/widget/UsageGraph.java
@@ -288,7 +288,11 @@
         canvas.drawPath(mPath, paint);
     }
 
-    private void drawFilledPath(Canvas canvas, SparseIntArray localPaths, Paint paint) {
+    @VisibleForTesting
+    void drawFilledPath(Canvas canvas, SparseIntArray localPaths, Paint paint) {
+        if (localPaths.size() == 0) {
+            return;
+        }
         mPath.reset();
         float lastStartX = localPaths.keyAt(0);
         mPath.moveTo(localPaths.keyAt(0), localPaths.valueAt(0));
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index ac11510..0be7c2b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -42,7 +42,6 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -582,6 +581,35 @@
         }
     }
 
+    /**
+     * Special handling for WPA2/WPA3 and OWE in Transition mode: The key
+     * SECURITY_PSK_SAE_TRANSITION and SECURITY_OWE_TRANSITION are pseudo keys which result by the
+     * scan results, but never appears in the saved networks.
+     * A saved network is either WPA3 for supporting devices or WPA2 for non-supporting devices,
+     * or, OWE for supporting devices or Open for non-supporting devices.
+     *
+     * @param accessPointSecurity Access point current security type
+     * @return Converted security type (if required)
+     */
+    private int convertSecurityTypeForMatching(int accessPointSecurity) {
+        if (accessPointSecurity == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
+            if (mWifiManager.isWpa3SaeSupported()) {
+                return AccessPoint.SECURITY_SAE;
+            } else {
+                return AccessPoint.SECURITY_PSK;
+            }
+        }
+        if (accessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
+            if (mWifiManager.isEnhancedOpenSupported()) {
+                return AccessPoint.SECURITY_OWE;
+            } else {
+                return AccessPoint.SECURITY_NONE;
+            }
+        }
+
+        return accessPointSecurity;
+    }
+
     public WifiConfiguration getConfig() {
         if (mMode == WifiConfigUiBase.MODE_VIEW) {
             return null;
@@ -604,6 +632,8 @@
 
         config.shared = mSharedCheckBox.isChecked();
 
+        mAccessPointSecurity = convertSecurityTypeForMatching(mAccessPointSecurity);
+
         switch (mAccessPointSecurity) {
             case AccessPoint.SECURITY_NONE:
                 config.allowedKeyManagement.set(KeyMgmt.NONE);
@@ -928,7 +958,8 @@
 
     private void showSecurityFields() {
         if (mAccessPointSecurity == AccessPoint.SECURITY_NONE ||
-                  mAccessPointSecurity == AccessPoint.SECURITY_OWE) {
+                mAccessPointSecurity == AccessPoint.SECURITY_OWE ||
+                mAccessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
             mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
             return;
         }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 4d3f230..8c4bfa2 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -494,7 +494,9 @@
                 if (isSavedNetwork) {
                     connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
                 } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                        (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
+                        (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
+                        (mSelectedAccessPoint.getSecurity()
+                                == AccessPoint.SECURITY_OWE_TRANSITION)) {
                     /** Bypass dialog for unsecured networks */
                     mSelectedAccessPoint.generateOpenNetworkConfig();
                     connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
@@ -748,7 +750,8 @@
                 preference.setOrder(index);
                 if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
                         && (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE &&
-                        accessPoint.getSecurity() != AccessPoint.SECURITY_OWE)) {
+                        accessPoint.getSecurity() != AccessPoint.SECURITY_OWE &&
+                        accessPoint.getSecurity() != AccessPoint.SECURITY_OWE_TRANSITION)) {
                     if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
                         onPreferenceTreeClick(preference);
                         mOpenSsid = null;
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 9b3c1b3..c4df567 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -268,7 +268,8 @@
         if (accessPoint.isOsuProvider()) {
             return CONNECT_TYPE_OSU_PROVISION;
         } else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
+                (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
+                (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE_TRANSITION)) {
             return CONNECT_TYPE_OPEN_NETWORK;
         } else if (accessPoint.isSaved() && config != null
                 && config.getNetworkSelectionStatus() != null
diff --git a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
index eb7e226..f2b3d75 100644
--- a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
+++ b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
@@ -29,7 +29,7 @@
 import com.android.settingslib.wifi.AccessPoint;
 
 /**
- * {@link AbstractPreferenceController} that launches Wi-Fi Easy Connect configurator flow
+ * {@link BasePreferenceController} that launches Wi-Fi Easy Connect configurator flow
  */
 public class AddDevicePreferenceController extends BasePreferenceController {
 
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index b7d41ba..6088fa5 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -313,9 +313,6 @@
     private void setTransformationMatrix(Size viewSize) {
         // Check aspect ratio, can only handle square view.
         final int viewRatio = (int)getRatio(viewSize.getWidth(), viewSize.getHeight());
-        if (viewRatio != 1) {
-            throw new IllegalArgumentException("Preview area should be square");
-        }
 
         final boolean isPortrait = mContext.get().getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_PORTRAIT ? true : false;
diff --git a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
index f1b0b6f..5c92d81 100644
--- a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
+++ b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.wifi.slice;
 
-import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.wifi.WifiManager;
@@ -30,35 +32,36 @@
 import com.android.settingslib.wifi.AccessPoint;
 
 /**
- * This activity helps connect to the Wi-Fi network which is open or saved
+ * This receiver helps connect to Wi-Fi network
  */
-public class ConnectToWifiHandler extends Activity {
+public class ConnectToWifiHandler extends BroadcastReceiver {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onReceive(Context context, Intent intent) {
+        if (context == null || intent == null) {
+            return;
+        }
 
-        final Network network = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
-        final Bundle accessPointState = getIntent().getBundleExtra(
+        final Network network = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
+        final Bundle accessPointState = intent.getBundleExtra(
                 WifiDialogActivity.KEY_ACCESS_POINT_STATE);
 
         if (network != null) {
             WifiScanWorker.clearClickedWifi();
-            final ConnectivityManager cm = getSystemService(ConnectivityManager.class);
+            final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
             // start captive portal app to sign in to network
             cm.startCaptivePortalApp(network);
         } else if (accessPointState != null) {
-            connect(new AccessPoint(this, accessPointState));
+            connect(context, new AccessPoint(context, accessPointState));
         }
-
-        finish();
     }
 
     @VisibleForTesting
-    void connect(AccessPoint accessPoint) {
+    void connect(Context context, AccessPoint accessPoint) {
+        ContextualWifiScanWorker.saveSession();
         WifiScanWorker.saveClickedWifi(accessPoint);
 
-        final WifiConnectListener connectListener = new WifiConnectListener(this);
+        final WifiConnectListener connectListener = new WifiConnectListener(context);
         switch (WifiUtils.getConnectingType(accessPoint)) {
             case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
                 accessPoint.startOsuProvisioning(connectListener);
@@ -68,7 +71,7 @@
                 accessPoint.generateOpenNetworkConfig();
 
             case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
-                final WifiManager wifiManager = getSystemService(WifiManager.class);
+                final WifiManager wifiManager = context.getSystemService(WifiManager.class);
                 wifiManager.connect(accessPoint.getConfig(), connectListener);
                 break;
         }
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
new file mode 100644
index 0000000..5e69b8a
--- /dev/null
+++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.wifi.slice;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.SystemClock;
+
+import com.android.settings.slices.SliceBackgroundWorker;
+
+/**
+ * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
+ */
+public class ContextualWifiScanWorker extends WifiScanWorker {
+
+    private static long sVisibleUiSessionToken;
+    private static long sActiveSession;
+
+    public ContextualWifiScanWorker(Context context, Uri uri) {
+        super(context, uri);
+    }
+
+    /**
+     * Starts a new visible UI session for the purpose of automatically starting captive portal.
+     *
+     * A visible UI session is defined as a duration of time when a UI screen is visible to user.
+     * Going to a sub-page and coming out breaks the continuation, leaving the page and coming back
+     * breaks it too.
+     */
+    public static void newVisibleUiSession() {
+        sVisibleUiSessionToken = SystemClock.elapsedRealtime();
+    }
+
+    static void saveSession() {
+        sActiveSession = sVisibleUiSessionToken;
+    }
+
+    @Override
+    protected void clearClickedWifiOnSliceUnpinned() {
+        // Do nothing for contextual Wi-Fi slice
+    }
+
+    @Override
+    protected boolean isSessionValid() {
+        if (sVisibleUiSessionToken != sActiveSession) {
+            clearClickedWifi();
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
index fefbf10..97b9241 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
@@ -90,4 +90,9 @@
                 && !nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY)
                 && nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
     }
+
+    @Override
+    public Class getBackgroundWorkerClass() {
+        return ContextualWifiScanWorker.class;
+    }
 }
diff --git a/src/com/android/settings/wifi/slice/WifiScanWorker.java b/src/com/android/settings/wifi/slice/WifiScanWorker.java
index 8697f00..a5bd74d 100644
--- a/src/com/android/settings/wifi/slice/WifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/WifiScanWorker.java
@@ -50,7 +50,7 @@
 import java.util.List;
 
 /**
- * {@link SliceBackgroundWorker} for Wi-Fi, used by WifiSlice.
+ * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link WifiSlice}.
  */
 public class WifiScanWorker extends SliceBackgroundWorker<AccessPoint> implements
         WifiTracker.WifiListener {
@@ -84,7 +84,7 @@
     protected void onSliceUnpinned() {
         mWifiTracker.onStop();
         unregisterNetworkCallback();
-        clearClickedWifi();
+        clearClickedWifiOnSliceUnpinned();
     }
 
     @Override
@@ -157,6 +157,14 @@
         return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid);
     }
 
+    protected void clearClickedWifiOnSliceUnpinned() {
+        clearClickedWifi();
+    }
+
+    protected boolean isSessionValid() {
+        return true;
+    }
+
     public void registerNetworkCallback(Network wifiNetwork) {
         if (wifiNetwork == null) {
             return;
@@ -224,12 +232,13 @@
 
             // Automatically start captive portal
             if (!prevIsCaptivePortal && mIsCaptivePortal
-                    && isWifiClicked(mWifiTracker.getManager().getConnectionInfo())) {
+                    && isWifiClicked(mWifiTracker.getManager().getConnectionInfo())
+                    && isSessionValid()) {
                 final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
                         .putExtra(ConnectivityManager.EXTRA_NETWORK, network)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                // Starting activity in the system process needs to specify a user
-                mContext.startActivityAsUser(intent, UserHandle.CURRENT);
+                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+                // Sending a broadcast in the system process needs to specify a user
+                mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
             }
         }
 
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index a687b93..e5c8de5 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -94,6 +94,7 @@
         final boolean isWifiEnabled = isWifiEnabled();
         ListBuilder listBuilder = getHeaderRow(isWifiEnabled);
         if (!isWifiEnabled) {
+            WifiScanWorker.clearClickedWifi();
             return listBuilder.build();
         }
 
@@ -133,11 +134,21 @@
         return listBuilder.build();
     }
 
+    private void handleNetworkCallback(WifiScanWorker worker, boolean isFirstApActive) {
+        if (worker == null) {
+            return;
+        }
+        if (isFirstApActive) {
+            worker.registerNetworkCallback(mWifiManager.getCurrentNetwork());
+        } else {
+            worker.unregisterNetworkCallback();
+        }
+    }
+
     private ListBuilder getHeaderRow(boolean isWifiEnabled) {
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_wireless);
         final String title = mContext.getString(R.string.wifi_settings);
-        final CharSequence summary = getSummary();
         final PendingIntent toggleAction = getBroadcastIntent(mContext);
         final PendingIntent primaryAction = getPrimaryAction();
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
@@ -150,22 +161,10 @@
                 .setKeywords(getKeywords())
                 .addRow(new ListBuilder.RowBuilder()
                         .setTitle(title)
-                        .setSubtitle(summary)
                         .addEndItem(toggleSliceAction)
                         .setPrimaryAction(primarySliceAction));
     }
 
-    private void handleNetworkCallback(WifiScanWorker worker, boolean isFirstApActive) {
-        if (worker == null) {
-            return;
-        }
-        if (isFirstApActive) {
-            worker.registerNetworkCallback(mWifiManager.getCurrentNetwork());
-        } else {
-            worker.unregisterNetworkCallback();
-        }
-    }
-
     private ListBuilder.RowBuilder getAccessPointRow(AccessPoint accessPoint) {
         final boolean isCaptivePortal = accessPoint.isActive() && isCaptivePortal();
         final CharSequence title = accessPoint.getTitle();
@@ -175,9 +174,8 @@
                 .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
                 .setTitle(title)
                 .setSubtitle(summary)
-                .setPrimaryAction(SliceAction.createDeeplink(
-                        getAccessPointAction(accessPoint, isCaptivePortal), levelIcon,
-                        ListBuilder.ICON_IMAGE, title));
+                .setPrimaryAction(getAccessPointAction(accessPoint, isCaptivePortal, levelIcon,
+                        title));
 
         if (isCaptivePortal) {
             rowBuilder.addEndItem(getCaptivePortalEndAction(accessPoint, title));
@@ -203,7 +201,7 @@
         final Drawable d = mContext.getDrawable(
                 com.android.settingslib.Utils.getWifiIconResource(accessPoint.getLevel()));
 
-        @ColorInt int color;
+        final @ColorInt int color;
         if (accessPoint.isActive()) {
             final NetworkInfo.State state = accessPoint.getNetworkInfo().getState();
             if (state == NetworkInfo.State.CONNECTED) {
@@ -232,36 +230,54 @@
     }
 
     private SliceAction getCaptivePortalEndAction(AccessPoint accessPoint, CharSequence title) {
-        return SliceAction.createDeeplink(
-                getAccessPointAction(accessPoint, false /* isCaptivePortal */),
-                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent),
-                ListBuilder.ICON_IMAGE, title);
+        return getAccessPointAction(accessPoint, false /* isCaptivePortal */,
+                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent), title);
     }
 
-    private PendingIntent getAccessPointAction(AccessPoint accessPoint, boolean isCaptivePortal) {
+    private SliceAction getAccessPointAction(AccessPoint accessPoint, boolean isCaptivePortal,
+            IconCompat icon, CharSequence title) {
+        final int requestCode = accessPoint.hashCode();
+        if (isCaptivePortal) {
+            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
+                    .putExtra(ConnectivityManager.EXTRA_NETWORK, mWifiManager.getCurrentNetwork());
+            return getBroadcastAction(requestCode, intent, icon, title);
+        }
+
         final Bundle extras = new Bundle();
         accessPoint.saveWifiState(extras);
 
-        Intent intent;
-        if (isCaptivePortal) {
-            intent = new Intent(mContext, ConnectToWifiHandler.class);
-            intent.putExtra(ConnectivityManager.EXTRA_NETWORK, mWifiManager.getCurrentNetwork());
-        } else if (accessPoint.isActive()) {
-            intent = new SubSettingLauncher(mContext)
+        if (accessPoint.isActive()) {
+            final Intent intent = new SubSettingLauncher(mContext)
                     .setTitleRes(R.string.pref_title_network_details)
                     .setDestination(WifiNetworkDetailsFragment.class.getName())
                     .setArguments(extras)
                     .setSourceMetricsCategory(SettingsEnums.WIFI)
                     .toIntent();
+            return getActivityAction(requestCode, intent, icon, title);
         } else if (WifiUtils.getConnectingType(accessPoint) != WifiUtils.CONNECT_TYPE_OTHERS) {
-            intent = new Intent(mContext, ConnectToWifiHandler.class);
-            intent.putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
+                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+            return getBroadcastAction(requestCode, intent, icon, title);
         } else {
-            intent = new Intent(mContext, WifiDialogActivity.class);
-            intent.putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+            final Intent intent = new Intent(mContext, WifiDialogActivity.class)
+                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+            return getActivityAction(requestCode, intent, icon, title);
         }
-        return PendingIntent.getActivity(mContext, accessPoint.hashCode() /* requestCode */,
-                intent, 0 /* flags */);
+    }
+
+    private SliceAction getActivityAction(int requestCode, Intent intent, IconCompat icon,
+            CharSequence title) {
+        final PendingIntent pi = PendingIntent.getActivity(mContext, requestCode, intent,
+                0 /* flags */);
+        return SliceAction.createDeeplink(pi, icon, ListBuilder.ICON_IMAGE, title);
+    }
+
+    private SliceAction getBroadcastAction(int requestCode, Intent intent, IconCompat icon,
+            CharSequence title) {
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        final PendingIntent pi = PendingIntent.getBroadcast(mContext, requestCode, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        return SliceAction.create(pi, icon, ListBuilder.ICON_IMAGE, title);
     }
 
     private ListBuilder.RowBuilder getLoadingRow(CharSequence placeholder) {
@@ -277,7 +293,7 @@
                 .setSubtitle(title);
     }
 
-    protected boolean isCaptivePortal() {
+    private boolean isCaptivePortal() {
         final NetworkCapabilities nc = mConnectivityManager.getNetworkCapabilities(
                 mWifiManager.getCurrentNetwork());
         return WifiUtils.canSignIntoNetwork(nc);
@@ -320,20 +336,6 @@
         }
     }
 
-    private CharSequence getSummary() {
-        switch (mWifiManager.getWifiState()) {
-            case WifiManager.WIFI_STATE_ENABLED:
-            case WifiManager.WIFI_STATE_ENABLING:
-                return mContext.getText(R.string.switch_on_text);
-            case WifiManager.WIFI_STATE_DISABLED:
-            case WifiManager.WIFI_STATE_DISABLING:
-                return mContext.getText(R.string.switch_off_text);
-            case WifiManager.WIFI_STATE_UNKNOWN:
-            default:
-                return null;
-        }
-    }
-
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
         return PendingIntent.getActivity(mContext, 0 /* requestCode */,
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index b965d78..5f4f31b 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -31,9 +32,6 @@
 @RunWith(RobolectricTestRunner.class)
 public class SetupWizardUtilsTest {
 
-    private static final String EXTRA_IS_SETUP_FLOW = "isSetupFlow";
-    private static final String EXTRA_IS_FIRST_RUN = "firstRun";
-
     @Test
     public void testCopySetupExtras() {
         Intent fromIntent = new Intent();
@@ -46,6 +44,25 @@
         assertThat(theme).isEqualTo(toIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME));
         assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false))
                 .isTrue();
+        assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true))
+                .isFalse();
+    }
+
+    @Test
+    public void testCopyLifecycleExtra() {
+        Intent fromIntent = new Intent();
+        final String theme = "TEST_THEME";
+        fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
+        fromIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
+        Bundle dstBundle = new Bundle();
+        dstBundle = SetupWizardUtils.copyLifecycleExtra(fromIntent.getExtras(), dstBundle);
+
+        assertThat(dstBundle).isNotNull();
+        assertThat(dstBundle.getString(WizardManagerHelper.EXTRA_THEME)).isNull();
+        assertThat(dstBundle.getBoolean(WizardManagerHelper.EXTRA_IS_SETUP_FLOW))
+                .isTrue();
+        assertThat(dstBundle.getBoolean(WizardManagerHelper.EXTRA_IS_FIRST_RUN))
+                .isFalse();
     }
 
     @Test
@@ -87,7 +104,7 @@
 
     private Intent createSetupWizardIntent() {
         return new Intent()
-                .putExtra(EXTRA_IS_SETUP_FLOW, true)
-                .putExtra(EXTRA_IS_FIRST_RUN, true);
+                .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
+                .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
index a0a9de9..c3a630b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivityTest.java
@@ -16,18 +16,27 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.accessibility.AccessibilitySettingsForSetupWizardActivity.CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW;
+
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.ComponentName;
 import android.content.Intent;
 
 import androidx.test.filters.SmallTest;
 
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.display.FontSizePreferenceFragmentForSetupWizard;
+
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 
 @RunWith(RobolectricTestRunner.class)
 @SmallTest
@@ -41,4 +50,37 @@
 
     assertThat(activity.getThemeResId()).isEqualTo(R.style.GlifV3Theme_Light);
   }
+
+  @Test
+  public void onCreate_hasFontSizeComponent_shouldGoToFontSizePreferenceDirectly() {
+    AccessibilitySettingsForSetupWizardActivity activity =
+            Robolectric.buildActivity(AccessibilitySettingsForSetupWizardActivity.class,
+                    new Intent(Intent.ACTION_MAIN).setComponent(new ComponentName(
+                            RuntimeEnvironment.application, CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW)).
+                            putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true).
+                            putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)).get();
+
+    activity.tryLaunchFontSizeSettings();
+
+    final Intent launchIntent = Shadows.shadowOf(activity).getNextStartedActivity();
+    assertThat(launchIntent).isNotNull();
+    assertThat(launchIntent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
+            FontSizePreferenceFragmentForSetupWizard.class.getName());
+    assertThat(activity.isFinishing()).isTrue();
+  }
+
+  @Test
+  public void onCreate_noFontSizeComponent_shouldNotFinishCurrentActivity() {
+    AccessibilitySettingsForSetupWizardActivity activity =
+            Robolectric.buildActivity(AccessibilitySettingsForSetupWizardActivity.class,
+                    new Intent(Intent.ACTION_MAIN).
+                            putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true).
+                            putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)).get();
+
+    activity.tryLaunchFontSizeSettings();
+
+    final Intent launchIntent = Shadows.shadowOf(activity).getNextStartedActivity();
+    assertThat(launchIntent).isNull();
+    assertThat(activity.isFinishing()).isFalse();
+  }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index a07ffb9..43bdc30 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -27,11 +27,9 @@
 import android.os.Vibrator;
 import android.provider.Settings;
 
-import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.display.DarkUIPreferenceController;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
@@ -46,8 +44,6 @@
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilitySettingsTest {
     private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
-    private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE =
-            "accessibility_content_timeout_preference_fragment";
     private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
             "accessibility_control_timeout_preference_fragment";
     private static final String DARK_UI_MODE_PREFERENCE =
@@ -71,9 +67,9 @@
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
-            .getNonIndexableKeys(mContext);
+                .getNonIndexableKeys(mContext);
         final List<String> keys =
-            XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
+                XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
 
         assertThat(keys).containsAllIn(niks);
     }
@@ -113,12 +109,6 @@
 
         for (int i = 0; i < testingValues.length; i++) {
             Settings.Secure.putString(mContentResolver,
-                    Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
-
-            verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE,
-                    exceptedResIds[i]);
-
-            Settings.Secure.putString(mContentResolver,
                     Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
 
             verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
index 531282b..7891664 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
@@ -45,8 +45,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilityTimeoutControllerTest
         implements AccessibilityTimeoutController.OnChangeListener {
-    private static final String PREF_KEY = "accessibility_content_timeout_30secs";
-    private static String PREF_TITLE;
+    private static final String PREF_KEY = "accessibility_control_timeout_30secs";
 
     private AccessibilityTimeoutController mController;
 
@@ -62,15 +61,14 @@
     public void setup() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new AccessibilityTimeoutController(mContext, mock(Lifecycle.class),
-                PREF_KEY, AccessibilityContentTimeoutPreferenceFragment.TAG);
+        mController = new AccessibilityTimeoutController(mContext, mock(Lifecycle.class), PREF_KEY);
         mController.setOnChangeListener(this);
         mContentResolver = mContext.getContentResolver();
-        PREF_TITLE = mContext.getResources().getString(R.string.accessibility_timeout_30secs);
+        String prefTitle = mContext.getResources().getString(R.string.accessibility_timeout_30secs);
 
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         when(mMockPref.getKey()).thenReturn(PREF_KEY);
-        when(mMockPref.getTitle()).thenReturn(PREF_TITLE);
+        when(mMockPref.getTitle()).thenReturn(prefTitle);
         mController.displayPreference(mScreen);
     }
 
@@ -87,7 +85,7 @@
     @Test
     public void updateState_notChecked() {
         Settings.Secure.putString(mContentResolver,
-                Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, "0");
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "0");
 
         mController.updateState(mMockPref);
 
@@ -99,7 +97,7 @@
     @Test
     public void updateState_checked() {
         Settings.Secure.putString(mContentResolver,
-                Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, "30000");
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "30000");
 
         mController.updateState(mMockPref);
 
@@ -113,8 +111,8 @@
         mController.onRadioButtonClicked(mMockPref);
 
         String accessibilityUiTimeoutValue = Settings.Secure.getString(mContentResolver,
-                Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS);
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS);
 
         assertThat(accessibilityUiTimeoutValue).isEqualTo("30000");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index b9bfcc1..0672bd4 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -27,7 +27,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
@@ -46,15 +45,16 @@
 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.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowSubscriptionManager;
+import org.robolectric.shadows.ShadowTelephonyManager;
 
 @Config(shadows = {
         ShadowUtils.class,
@@ -71,7 +71,6 @@
     private NetworkPolicyManager mNetworkPolicyManager;
     @Mock
     private NetworkStatsManager mNetworkStatsManager;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private TelephonyManager mTelephonyManager;
     private Context mContext;
     private FragmentActivity mActivity;
@@ -90,8 +89,11 @@
         shadowContext.setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager);
 
         mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+        final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(mTelephonyManager);
+        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID, mTelephonyManager);
+        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(1, mTelephonyManager);
         mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
         doReturn(mNetworkStatsManager).when(mActivity).getSystemService(NetworkStatsManager.class);
 
@@ -188,7 +190,7 @@
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
         ShadowDataUsageUtils.HAS_SIM = false;
         ShadowSubscriptionManager.setDefaultDataSubscriptionId(
-            SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
         doReturn(mContext).when(dataUsageSummary).getContext();
diff --git a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
new file mode 100644
index 0000000..11ca63f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+
+import static com.android.settings.development.BubbleGlobalPreferenceController.OFF;
+import static com.android.settings.development.BubbleGlobalPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class BubbleGlobalPreferenceControllerTest {
+    private Context mContext;
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private BubbleGlobalPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new BubbleGlobalPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_allowBubbles_shouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        assertThat(isSettingEnabled()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_allowBubbles_shouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        assertThat(isSettingEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, 1 /* enabled */);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, 0 /* enabled */);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisable() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+
+        assertThat(isSettingEnabled()).isFalse();
+    }
+
+    private boolean isSettingEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+                OFF /* default off */) == ON;
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index f38668c..7ad8d63 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -86,8 +86,8 @@
 
         mController = spy(new ImeiInfoDialogController(mDialog, SLOT_ID));
 
-        doReturn(PRL_VERSION).when(mController).getCdmaPrlVersion();
-        doReturn(MEID_NUMBER).when(mController).getMeid();
+        when(mTelephonyManager.getCdmaPrlVersion()).thenReturn(PRL_VERSION);
+        when(mTelephonyManager.getMeid(anyInt())).thenReturn(MEID_NUMBER);
         when(mTelephonyManager.getCdmaMin(anyInt())).thenReturn(MIN_NUMBER);
         when(mTelephonyManager.getDeviceSoftwareVersion(anyInt())).thenReturn(IMEI_SV_NUMBER);
         when(mTelephonyManager.getImei(anyInt())).thenReturn(IMEI_NUMBER);
@@ -98,6 +98,7 @@
         mController = spy(new ImeiInfoDialogController(mDialog, SLOT_ID + 1));
 
         mController.populateImeiInfo();
+
         verify(mDialog, never()).setText(anyInt(), any());
     }
 
@@ -129,17 +130,31 @@
     }
 
     @Test
-    public void populateImeiInfo_cdmaSimDisabled_shouldRemoveImeiInfoAndSetMinToEmpty() {
+    public void populateImeiInfo_cdmaSimDisabled_shouldRemoveImeiInfoAndSetMinPrlToEmpty() {
         ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
         when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
 
         mController.populateImeiInfo();
 
+        verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
         verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");
+        verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");
         verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
     }
 
     @Test
+    public void populateImeiInfo_gsmSimDisabled_shouldSetImeiAndRemoveCdmaSettings() {
+        ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+
+        mController.populateImeiInfo();
+
+        verify(mDialog).setText(eq(ID_IMEI_VALUE), any());
+        verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());
+        verify(mDialog).removeViewFromScreen(ID_CDMA_SETTINGS);
+    }
+
+    @Test
     public void populateImeinfo_gsm_shouldSetImeiAndRemoveCdmaSettings() {
         when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
 
diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
new file mode 100644
index 0000000..3659803
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.IPowerManager;
+import android.os.PowerManager;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class DarkUIPreferenceControllerTest {
+
+    private DarkUIPreferenceController mController;
+    private Context mContext;
+    @Mock
+    private Fragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mController = spy(new DarkUIPreferenceController(mContext, "dark_ui_mode"));
+        mController.setParentFragment(mFragment);
+        mController.mPreference = new SwitchPreference(mContext);
+        mController.onStart();
+    }
+
+    @Test
+    public void batterySaverToggles_disabledStateUpdates() {
+        doReturn(true).when(mController).isPowerSaveMode();
+        mController.updateEnabledStateIfNeeded();
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+
+        doReturn(false).when(mController).isPowerSaveMode();
+        mController.updateEnabledStateIfNeeded();
+        assertThat(mController.mPreference.isEnabled()).isTrue();
+
+        doReturn(true).when(mController).isPowerSaveMode();
+        mController.updateEnabledStateIfNeeded();
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
deleted file mode 100644
index 5c02101..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationEdgeToEdgePreferenceControllerTest {
-
-    private Context mContext;
-    private ShadowPackageManager mPackageManager;
-
-    @Mock
-    private IOverlayManager mOverlayManager;
-
-    private SystemNavigationEdgeToEdgePreferenceController mController;
-
-    private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                true);
-
-        mContext = RuntimeEnvironment.application;
-        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
-        mController = new SystemNavigationEdgeToEdgePreferenceController(mContext, mOverlayManager,
-                PREF_KEY_EDGE_TO_EDGE);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        final ResolveInfo info = new ResolveInfo();
-        info.serviceInfo = new ServiceInfo();
-        info.resolvePackageName = recentsComponentName.getPackageName();
-        info.serviceInfo.packageName = info.resolvePackageName;
-        info.serviceInfo.name = recentsComponentName.getClassName();
-        info.serviceInfo.applicationInfo = new ApplicationInfo();
-        info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
-        assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                false);
-
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
-        assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
-                .isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
-        assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext))
-                .isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
-        assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext,
-                "com.package.fake")).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsEdgeToEdge_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_GESTURAL);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsLegacy_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_3BUTTON);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsSwipeUp_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_2BUTTON);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_GESTURAL);
-        // Set the setting to be enabled.
-        mController.onRadioButtonClicked(null);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
-        RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-
-        when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
-        when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
-        when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
-        mController.displayPreference(screen);
-        mController.onRadioButtonClicked(radioEdgeToEdge);
-
-        verify(radioLegacy, times(1)).setChecked(false);
-        verify(radioSwipeUp, times(1)).setChecked(false);
-        verify(radioEdgeToEdge, times(1)).setChecked(true);
-    }
-
-    @Test
-    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isFalse();
-    }
-
-    @Test
-    public void isSliceableIncorrectKey_returnsFalse() {
-        final SystemNavigationEdgeToEdgePreferenceController controller =
-                new SystemNavigationEdgeToEdgePreferenceController(mContext, "bad_key");
-        assertThat(controller.isSliceable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java
new file mode 100644
index 0000000..1f3a758
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.gestures;
+
+import static android.os.UserHandle.USER_CURRENT;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
+
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_2BUTTONS;
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_3BUTTONS;
+import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_GESTURAL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.os.ServiceManager;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+import com.android.internal.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class SystemNavigationGestureSettingsTest {
+
+    private Context mContext;
+
+    private IOverlayManager mOverlayManager;
+
+    private SystemNavigationGestureSettings mSettings;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mOverlayManager = mock(IOverlayManager.class);
+
+        mSettings = new SystemNavigationGestureSettings();
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                SystemNavigationGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void testGetCurrentSystemNavigationMode() {
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_GESTURAL);
+        assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+                KEY_SYSTEM_NAV_GESTURAL)).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_3BUTTON);
+        assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+                KEY_SYSTEM_NAV_3BUTTONS)).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_2BUTTON);
+        assertThat(TextUtils.equals(mSettings.getCurrentSystemNavigationMode(mContext),
+                KEY_SYSTEM_NAV_2BUTTONS)).isTrue();
+    }
+
+    @Test
+    public void testSetCurrentSystemNavigationMode() throws Exception {
+        mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_GESTURAL);
+        verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+                NAV_BAR_MODE_GESTURAL_OVERLAY, USER_CURRENT);
+
+        mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_2BUTTONS);
+        verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+                NAV_BAR_MODE_2BUTTON_OVERLAY, USER_CURRENT);
+
+        mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_3BUTTONS);
+        verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
+                NAV_BAR_MODE_3BUTTON_OVERLAY, USER_CURRENT);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
deleted file mode 100644
index ebb1eb0..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationLegacyPreferenceControllerTest {
-
-    private Context mContext;
-    private ShadowPackageManager mPackageManager;
-
-    @Mock
-    private IOverlayManager mOverlayManager;
-
-    private SystemNavigationLegacyPreferenceController mController;
-
-    private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                true);
-
-        mContext = RuntimeEnvironment.application;
-        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
-        mController = new SystemNavigationLegacyPreferenceController(mContext, mOverlayManager,
-                PREF_KEY_LEGACY);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        final ResolveInfo info = new ResolveInfo();
-        info.serviceInfo = new ServiceInfo();
-        info.resolvePackageName = recentsComponentName.getPackageName();
-        info.serviceInfo.packageName = info.resolvePackageName;
-        info.serviceInfo.name = recentsComponentName.getClassName();
-        info.serviceInfo.applicationInfo = new ApplicationInfo();
-        info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
-        assertThat(SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                false);
-
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
-        assertThat(
-                SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext)).isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
-        assertThat(
-                SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext)).isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
-        assertThat(SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext,
-                "com.package.fake")).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsLegacy_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_3BUTTON);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsSwipeUp_shouldReturnFalse() {
-        // Turn on the Swipe Up mode (2-buttons)
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_2BUTTON);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsEdgeToEdge_shouldReturnFalse() {
-        // Turn on the Edge to Edge
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_GESTURAL);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_3BUTTON);
-        // Set the setting to be enabled.
-        mController.onRadioButtonClicked(null);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
-        RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-
-        when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
-        when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
-        when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
-        mController.displayPreference(screen);
-        mController.onRadioButtonClicked(radioLegacy);
-
-        verify(radioLegacy, times(1)).setChecked(true);
-        verify(radioSwipeUp, times(1)).setChecked(false);
-        verify(radioEdgeToEdge, times(1)).setChecked(false);
-    }
-
-    @Test
-    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isFalse();
-    }
-
-    @Test
-    public void isSliceableIncorrectKey_returnsFalse() {
-        final SystemNavigationLegacyPreferenceController controller =
-                new SystemNavigationLegacyPreferenceController(mContext, "bad_key");
-        assertThat(controller.isSliceable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
new file mode 100644
index 0000000..095c4d7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationPreferenceControllerTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.gestures;
+
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
+import static com.android.settings.gestures.SystemNavigationPreferenceController.PREF_KEY_SYSTEM_NAVIGATION;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.text.TextUtils;
+
+import com.android.internal.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class SystemNavigationPreferenceControllerTest {
+
+    private Context mContext;
+    private ShadowPackageManager mPackageManager;
+
+    private SystemNavigationPreferenceController mController;
+
+    private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                true);
+
+        mContext = RuntimeEnvironment.application;
+        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+
+        mController = new SystemNavigationPreferenceController(mContext,
+                PREF_KEY_SYSTEM_NAVIGATION);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
+        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
+                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
+        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+                .setPackage(recentsComponentName.getPackageName());
+        final ResolveInfo info = new ResolveInfo();
+        info.serviceInfo = new ServiceInfo();
+        info.resolvePackageName = recentsComponentName.getPackageName();
+        info.serviceInfo.packageName = info.resolvePackageName;
+        info.serviceInfo.name = recentsComponentName.getClassName();
+        info.serviceInfo.applicationInfo = new ApplicationInfo();
+        info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
+        mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
+
+        assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isTrue();
+    }
+
+    @Test
+    public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                false);
+
+        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
+                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
+        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+                .setPackage(recentsComponentName.getPackageName());
+        mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
+
+        assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isFalse();
+    }
+
+    @Test
+    public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
+        assertThat(SystemNavigationPreferenceController.isGestureAvailable(mContext)).isFalse();
+    }
+
+    @Test
+    public void testIsOverlayPackageAvailable_noOverlayPackage_shouldReturnFalse() {
+        assertThat(SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
+                "com.package.fake")).isFalse();
+    }
+
+    @Test
+    public void testIsSwipeUpEnabled() {
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_2BUTTON);
+        assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_3BUTTON);
+        assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isFalse();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_GESTURAL);
+        assertThat(SystemNavigationPreferenceController.isSwipeUpEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void testIsEdgeToEdgeEnabled() {
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_GESTURAL);
+        assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_3BUTTON);
+        assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isFalse();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_2BUTTON);
+        assertThat(SystemNavigationPreferenceController.isEdgeToEdgeEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void testGetSummary() {
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_GESTURAL);
+        assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
+                com.android.settings.R.string.edge_to_edge_navigation_title))).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_3BUTTON);
+        assertThat(TextUtils.equals(mController.getSummary(),
+                mContext.getText(com.android.settings.R.string.legacy_navigation_title))).isTrue();
+
+        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
+                NAV_BAR_MODE_2BUTTON);
+        assertThat(TextUtils.equals(mController.getSummary(), mContext.getText(
+                com.android.settings.R.string.swipe_up_to_switch_apps_title))).isTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
deleted file mode 100644
index f8a0b58..0000000
--- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
-
-import static com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController.PREF_KEY_EDGE_TO_EDGE;
-import static com.android.settings.gestures.SystemNavigationLegacyPreferenceController.PREF_KEY_LEGACY;
-import static com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController.PREF_KEY_SWIPE_UP;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.widget.RadioButtonPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class SystemNavigationSwipeUpPreferenceControllerTest {
-
-    private Context mContext;
-    private ShadowPackageManager mPackageManager;
-
-    @Mock
-    private IOverlayManager mOverlayManager;
-
-    private SystemNavigationSwipeUpPreferenceController mController;
-
-    private static final String ACTION_QUICKSTEP = "android.intent.action.QUICKSTEP_SERVICE";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                true);
-
-        mContext = RuntimeEnvironment.application;
-        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-
-        mController = new SystemNavigationSwipeUpPreferenceController(mContext, mOverlayManager,
-                PREF_KEY_SWIPE_UP);
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        final ResolveInfo info = new ResolveInfo();
-        info.serviceInfo = new ServiceInfo();
-        info.resolvePackageName = recentsComponentName.getPackageName();
-        info.serviceInfo.packageName = info.resolvePackageName;
-        info.serviceInfo.name = recentsComponentName.getClassName();
-        info.serviceInfo.applicationInfo = new ApplicationInfo();
-        info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
-
-        assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
-                .isTrue();
-    }
-
-    @Test
-    public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
-                false);
-
-        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
-        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
-                .setPackage(recentsComponentName.getPackageName());
-        mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
-
-        assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
-                .isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
-        assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext))
-                .isFalse();
-    }
-
-    @Test
-    public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
-        assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext,
-                "com.package.fake")).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsSwipeUp_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_2BUTTON);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsLegacy_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_3BUTTON);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_defaultIsEdgeToEdge_shouldReturnFalse() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_GESTURAL);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testIsChecked_radioButtonClicked_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,
-                NAV_BAR_MODE_2BUTTON);
-        // Set the setting to be enabled.
-        mController.onRadioButtonClicked(null);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testOnRadioButtonClicked_setsCorrectRadioButtonChecked() {
-        RadioButtonPreference radioLegacy = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioSwipeUp = mock(RadioButtonPreference.class);
-        RadioButtonPreference radioEdgeToEdge = mock(RadioButtonPreference.class);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
-
-        when(screen.findPreference(PREF_KEY_LEGACY)).thenReturn(radioLegacy);
-        when(screen.findPreference(PREF_KEY_SWIPE_UP)).thenReturn(radioSwipeUp);
-        when(screen.findPreference(PREF_KEY_EDGE_TO_EDGE)).thenReturn(radioEdgeToEdge);
-
-        mController.displayPreference(screen);
-        mController.onRadioButtonClicked(radioSwipeUp);
-
-        verify(radioLegacy, times(1)).setChecked(false);
-        verify(radioSwipeUp, times(1)).setChecked(true);
-        verify(radioEdgeToEdge, times(1)).setChecked(false);
-    }
-
-    @Test
-    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isFalse();
-    }
-
-    @Test
-    public void isSliceableIncorrectKey_returnsFalse() {
-        final SystemNavigationSwipeUpPreferenceController controller =
-                new SystemNavigationSwipeUpPreferenceController(mContext, "bad_key");
-        assertThat(controller.isSliceable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index b7c21b8..e8d7713 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -91,25 +91,23 @@
     }
 
     @Test
-    public void getDisplayableCards_refreshCardUri_shouldLogContextualCardDisplay() {
+    public void getDisplayableCards_refreshCardUri_shouldLogContextualCard() {
         mContextualCardLoader.mNotifyUri = CardContentProvider.REFRESH_CARD_URI;
 
         mContextualCardLoader.getDisplayableCards(new ArrayList<>());
 
         verify(mFakeFeatureFactory.metricsFeatureProvider).action(any(),
-                eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW), any(String.class));
-        verify(mFakeFeatureFactory.metricsFeatureProvider).action(any(),
                 eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW), any(String.class));
     }
 
     @Test
-    public void getDisplayableCards_deleteCardUri_shouldNotLogContextualCardDisplay() {
+    public void getDisplayableCards_deleteCardUri_shouldNotLogContextualCard() {
         mContextualCardLoader.mNotifyUri = CardContentProvider.DELETE_CARD_URI;
 
         mContextualCardLoader.getDisplayableCards(new ArrayList<>());
 
         verify(mFakeFeatureFactory.metricsFeatureProvider, never()).action(any(),
-                eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW), any(String.class));
+                eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW), any(String.class));
     }
 
     private List<ContextualCard> getContextualCardList() {
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
index 588b7aa..b3aae03 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
@@ -17,13 +17,13 @@
 package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
-
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
@@ -31,19 +31,18 @@
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
-
 import com.android.settings.R;
 import com.android.settings.testutils.SliceTester;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
-
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-
-import java.util.List;
+import org.robolectric.shadows.ShadowTelephonyManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowDataUsageUtils.class)
@@ -62,6 +61,11 @@
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
 
         mDataUsageSlice = spy(new DataUsageSlice(mContext));
+
+        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+        final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(telephonyManager);
+        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID, telephonyManager);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index 1ba1dc9..c5584d0 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -26,6 +26,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
+import android.telephony.TelephonyManager;
 
 import androidx.slice.Slice;
 import androidx.slice.SliceMetadata;
@@ -47,12 +48,15 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowTelephonyManager;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothUtils.class})
+@Config(shadows = {ShadowBluetoothUtils.class,
+        ShadowTelephonyManager.class})
 public class MediaOutputIndicatorSliceTest {
 
     private static final String TEST_A2DP_DEVICE_NAME = "Test_A2DP_BT_Device_NAME";
@@ -76,11 +80,14 @@
     private Context mContext;
     private List<BluetoothDevice> mDevicesList;
     private MediaOutputIndicatorSlice mMediaOutputIndicatorSlice;
+    private ShadowTelephonyManager mShadowTelephonyManager;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
+        mShadowTelephonyManager = Shadow.extract(mContext.getSystemService(
+                Context.TELEPHONY_SERVICE));
         // Set-up specs for SliceMetadata.
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
 
@@ -151,4 +158,31 @@
         assertThat(metadata.getTitle()).isEqualTo(mContext.getText(R.string.media_output_title));
         assertThat(metadata.getSubtitle()).isEqualTo(TEST_HAP_DEVICE_NAME);
     }
+
+    @Test
+    public void getSlice_callStateIdle_available() {
+        mDevicesList.add(mA2dpDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
+        mShadowTelephonyManager.setCallState(TelephonyManager.CALL_STATE_IDLE);
+
+        assertThat(mMediaOutputIndicatorSlice.getSlice()).isNotNull();
+    }
+
+    @Test
+    public void getSlice_callStateRinging_returnNull() {
+        mDevicesList.add(mA2dpDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
+        mShadowTelephonyManager.setCallState(TelephonyManager.CALL_STATE_RINGING);
+
+        assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
+    }
+
+    @Test
+    public void getSlice_callStateOffHook_returnNull() {
+        mDevicesList.add(mA2dpDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
+        mShadowTelephonyManager.setCallState(TelephonyManager.CALL_STATE_OFFHOOK);
+
+        assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
index e2ac8ce..ce4c9a2 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -123,6 +123,18 @@
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
+
+    @Test
+    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
     @Test
     public void handPreferenceTreeClick_fireIntent() {
         ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
index 5ffda81..7a097e7 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
@@ -17,7 +17,6 @@
 package com.android.settings.network.telephony;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -30,12 +29,9 @@
 import android.provider.Settings;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-
 import androidx.preference.SwitchPreference;
-
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.net.DataUsageController;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,6 +40,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowTelephonyManager;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
@@ -51,8 +49,6 @@
     private static final int SUB_ID = 2;
 
     @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
     private NetworkStatsManager mNetworkStatsManager;
     private DataUsagePreferenceController mController;
     private SwitchPreference mPreference;
@@ -63,8 +59,13 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(Robolectric.setupActivity(Activity.class));
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+        final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(telephonyManager);
+        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(SUB_ID, telephonyManager);
+        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID, telephonyManager);
+
         doReturn(mNetworkStatsManager).when(mContext).getSystemService(NetworkStatsManager.class);
 
         mPreference = new SwitchPreference(mContext);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index 7dfe520..61599e6 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -198,4 +198,25 @@
         assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext))
                 .isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
     }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_HideCarrierNetwork_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                true);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isFalse();
+    }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_allCheckPass_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
deleted file mode 100644
index f3f51c5..0000000
--- a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
-import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
-import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
-@RunWith(RobolectricTestRunner.class)
-public class BubbleNotificationPreferenceControllerTest {
-
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private BubbleNotificationPreferenceController mController;
-    private Preference mPreference;
-
-    private static final String KEY_NOTIFICATION_BUBBLES = "notification_bubbles";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new BubbleNotificationPreferenceController(mContext,
-                KEY_NOTIFICATION_BUBBLES);
-        mPreference = new Preference(RuntimeEnvironment.application);
-        mPreference.setKey(mController.getPreferenceKey());
-        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
-    }
-
-    @Test
-    public void display_shouldDisplay() {
-        assertThat(mPreference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
-        final TwoStatePreference preference = mock(TwoStatePreference.class);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF);
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, ON)).isEqualTo(OFF);
-
-        mController.updateState(preference);
-
-        verify(preference).setChecked(false);
-    }
-
-    @Test
-    public void isChecked_settingIsOff_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF);
-
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_settingIsOn_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON);
-
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void setChecked_setFalse_disablesSetting() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON);
-
-        mController.setChecked(false);
-        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, -1);
-
-        assertThat(updatedValue).isEqualTo(OFF);
-    }
-
-    @Test
-    public void setChecked_setTrue_enablesSetting() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF);
-
-        mController.setChecked(true);
-        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BUBBLES, -1);
-
-        assertThat(updatedValue).isEqualTo(ON);
-    }
-
-    @Test
-    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
index ea66964..67324e9 100644
--- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
@@ -22,6 +22,9 @@
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
 
+import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF;
+import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -96,6 +99,7 @@
 
     @Test
     public void testIsAvailable_notIfAppBlocked() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.banned = true;
         mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -104,6 +108,7 @@
 
     @Test
     public void testIsAvailable_notIfChannelBlocked() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -113,6 +118,7 @@
 
     @Test
     public void testIsAvailable_channel_notIfAppOff() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = false;
         NotificationChannel channel = mock(NotificationChannel.class);
@@ -123,12 +129,13 @@
     }
 
     @Test
-    public void testIsAvailable_ifOffGlobally_app() {
+    public void testIsNotAvailable_ifOffGlobally_app() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         mController.onResume(appRow, null, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
 
-        assertTrue(mController.isAvailable());
+        assertFalse(mController.isAvailable());
     }
 
     @Test
@@ -137,7 +144,8 @@
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
 
         assertFalse(mController.isAvailable());
     }
@@ -146,7 +154,7 @@
     public void testIsAvailable_app() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         mController.onResume(appRow, null, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertTrue(mController.isAvailable());
     }
@@ -159,7 +167,7 @@
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertTrue(mController.isAvailable());
     }
@@ -171,7 +179,7 @@
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertTrue(mController.isAvailable());
     }
@@ -183,7 +191,7 @@
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertFalse(mController.isAvailable());
     }
@@ -203,6 +211,7 @@
 
     @Test
     public void testUpdateState_channelNotBlockable() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
@@ -216,6 +225,7 @@
 
     @Test
     public void testUpdateState_channel() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.canBubble()).thenReturn(true);
@@ -235,6 +245,7 @@
 
     @Test
     public void testUpdateState_app() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.label = "App!";
         appRow.allowBubbles = true;
@@ -256,7 +267,8 @@
 
     @Test
     public void testUpdateState_app_offGlobally() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.label = "App!";
         appRow.allowBubbles = true;
@@ -269,6 +281,7 @@
 
     @Test
     public void testOnPreferenceChange_on_channel() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = true;
         NotificationChannel channel =
@@ -288,6 +301,7 @@
 
     @Test
     public void testOnPreferenceChange_off_channel() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = true;
         NotificationChannel channel =
@@ -307,6 +321,7 @@
 
     @Test
     public void testOnPreferenceChange_on_app() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = false;
         mController.onResume(appRow, null, null, null);
@@ -324,6 +339,7 @@
 
     @Test
     public void testOnPreferenceChange_off_app() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = true;
         mController.onResume(appRow, null, null, null);
@@ -341,7 +357,8 @@
 
     @Test
     public void testOnPreferenceChange_on_app_offGlobally() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+                SYSTEM_WIDE_OFF);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = false;
         mController.onResume(appRow, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
deleted file mode 100644
index 4bdb2cc..0000000
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
-import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
-import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-
-@RunWith(RobolectricTestRunner.class)
-public class BubbleSummaryNotificationPreferenceControllerTest {
-
-    private Context mContext;
-
-    private BubbleSummaryNotificationPreferenceController mController;
-    private Preference mPreference;
-
-    private static final String KEY_NOTIFICATION_BUBBLES = "notification_bubbles";
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new BubbleSummaryNotificationPreferenceController(mContext,
-                KEY_NOTIFICATION_BUBBLES);
-        mPreference = new Preference(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void display_shouldDisplay() {
-        assertThat(mPreference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void getSummary() {
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF);
-
-        assertThat(mController.getSummary()).isEqualTo("Off");
-
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON);
-
-        assertThat(mController.getSummary()).isEqualTo("On");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
index 0a0addc..04c8e4e 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
@@ -22,6 +22,9 @@
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
 
+import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
+import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
+
 import static junit.framework.TestCase.assertEquals;
 
 import static org.junit.Assert.assertFalse;
@@ -95,7 +98,8 @@
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+                SYSTEM_WIDE_OFF);
 
         assertFalse(mController.isAvailable());
     }
@@ -104,18 +108,19 @@
     public void testIsAvailable_app() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         mController.onResume(appRow, null, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertTrue(mController.isAvailable());
     }
 
     @Test
-    public void testIsAvailable_app_globalOff() {
+    public void testIsNotAvailable_app_globalOff() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         mController.onResume(appRow, null, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+                SYSTEM_WIDE_OFF);
 
-        assertTrue(mController.isAvailable());
+        assertFalse(mController.isAvailable());
     }
 
     @Test
@@ -126,7 +131,7 @@
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
         mController.onResume(appRow, channel, null, null);
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
 
         assertTrue(mController.isAvailable());
     }
@@ -144,16 +149,18 @@
 
     @Test
     public void testGetSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.allowBubbles = true;
         mController.onResume(appRow, null, null, null);
 
         assertEquals("On", mController.getSummary());
 
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+                SYSTEM_WIDE_OFF);
         assertEquals("Off", mController.getSummary());
 
-        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         appRow.allowBubbles = false;
         mController.onResume(appRow, null, null, null);
 
diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
index d47d125..93bd8dc 100644
--- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
@@ -168,7 +168,6 @@
 
     @Test
     public void display_showRecents() throws Exception {
-
         List<Event> events = new ArrayList<>();
         Event app = new Event();
         app.mEventType = Event.NOTIFICATION_INTERRUPTION;
@@ -262,8 +261,12 @@
         ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mCategory, times(2)).addPreference(prefCaptor.capture());
         List<Preference> prefs = prefCaptor.getAllValues();
-        assertThat(prefs.get(1).getKey()).isEqualTo(app.getPackageName());
-        assertThat(prefs.get(0).getKey()).isEqualTo(app1.getPackageName());
+        assertThat(prefs.get(1).getKey()).isEqualTo(
+                RecentNotifyingAppsPreferenceController.getKey(UserHandle.myUserId(),
+                        app.getPackageName()));
+        assertThat(prefs.get(0).getKey()).isEqualTo(
+                RecentNotifyingAppsPreferenceController.getKey(UserHandle.myUserId(),
+                        app1.getPackageName()));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java
index 7f09c3b..ebb496c 100644
--- a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java
+++ b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java
@@ -24,6 +24,8 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.util.SparseIntArray;
 
 import com.android.settingslib.R;
@@ -177,4 +179,14 @@
         assertThat(localPaths.keyAt(5)).isEqualTo(1001);
         assertThat(localPaths.valueAt(5)).isEqualTo(-1);
     }
+
+    @Test
+    public void drawFilledPath_emptyPath_shouldNotCrash() {
+        final Canvas canvas = new Canvas();
+        final SparseIntArray localPaths = new SparseIntArray();
+        final Paint paint = new Paint();
+
+        // Should not crash
+        mGraph.drawFilledPath(canvas, localPaths, paint);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
index cea8365..1eb7818 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
 import android.net.wifi.WifiManager;
@@ -35,8 +36,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -44,6 +45,7 @@
 public class ConnectToWifiHandlerTest {
 
     private static final String AP_SSID = "\"ap\"";
+    private Context mContext;
     private ConnectToWifiHandler mHandler;
     private WifiConfiguration mWifiConfig;
     @Mock
@@ -53,7 +55,8 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mHandler = Robolectric.setupActivity(ConnectToWifiHandler.class);
+        mContext = RuntimeEnvironment.application;
+        mHandler = new ConnectToWifiHandler();
         mWifiConfig = new WifiConfiguration();
         mWifiConfig.SSID = AP_SSID;
         doReturn(mWifiConfig).when(mAccessPoint).getConfig();
@@ -64,7 +67,7 @@
         when(mAccessPoint.isSaved()).thenReturn(false);
         when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_NONE);
 
-        mHandler.connect(mAccessPoint);
+        mHandler.connect(mContext, mAccessPoint);
 
         assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
     }
@@ -74,7 +77,7 @@
         when(mAccessPoint.isSaved()).thenReturn(false);
         when(mAccessPoint.isOsuProvider()).thenReturn(true);
 
-        mHandler.connect(mAccessPoint);
+        mHandler.connect(mContext, mAccessPoint);
 
         verify(mAccessPoint).startOsuProvisioning(any(WifiManager.ActionListener.class));
     }
@@ -85,7 +88,7 @@
         when(mAccessPoint.isSaved()).thenReturn(false);
         when(mAccessPoint.isPasspoint()).thenReturn(true);
 
-        mHandler.connect(mAccessPoint);
+        mHandler.connect(mContext, mAccessPoint);
 
         assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
     }
@@ -98,7 +101,7 @@
         status.setHasEverConnected(true);
         mWifiConfig.setNetworkSelectionStatus(status);
 
-        mHandler.connect(mAccessPoint);
+        mHandler.connect(mContext, mAccessPoint);
 
         assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
     }
@@ -108,7 +111,7 @@
         when(mAccessPoint.isSaved()).thenReturn(false);
         when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
 
-        mHandler.connect(mAccessPoint);
+        mHandler.connect(mContext, mAccessPoint);
 
         assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
     }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
new file mode 100644
index 0000000..0e52520
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.wifi.slice;
+
+import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.wifi.WifiManager;
+import android.os.UserHandle;
+
+import com.android.settings.testutils.shadow.ShadowWifiManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowWifiManager.class,
+        WifiScanWorkerTest.ShadowWifiTracker.class,
+})
+public class ContextualWifiScanWorkerTest {
+
+    private Context mContext;
+    private WifiManager mWifiManager;
+    private ConnectivityManager mConnectivityManager;
+    private ContextualWifiScanWorker mWifiScanWorker;
+    private ConnectToWifiHandler mConnectToWifiHandler;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+        mWifiManager = mContext.getSystemService(WifiManager.class);
+        mWifiManager.setWifiEnabled(true);
+
+        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
+        mWifiScanWorker = new ContextualWifiScanWorker(mContext, CONTEXTUAL_WIFI_SLICE_URI);
+        mConnectToWifiHandler = new ConnectToWifiHandler();
+    }
+
+    @After
+    public void tearDown() {
+        mWifiScanWorker.clearClickedWifi();
+    }
+
+    @Test
+    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldSendBroadcast() {
+        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
+        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
+        final Network network = mConnectivityManager.getActiveNetwork();
+        mWifiScanWorker.registerNetworkCallback(network);
+        final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
+
+        mWifiScanWorker.onSlicePinned();
+        mConnectToWifiHandler.onReceive(mContext, intent);
+        mWifiScanWorker.onSliceUnpinned();
+        callback.onCapabilitiesChanged(network,
+                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
+
+        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+    }
+
+    @Test
+    public void NetworkCallback_onCapabilitiesChanged_newSession_shouldNotSendBroadcast() {
+        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
+        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
+        final Network network = mConnectivityManager.getActiveNetwork();
+        mWifiScanWorker.registerNetworkCallback(network);
+
+        mConnectToWifiHandler.onReceive(mContext, intent);
+        ContextualWifiScanWorker.newVisibleUiSession();
+        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
+                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
+
+        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
index b246e9a..1c84eb6 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.wifi.slice;
 
 import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
+import static com.android.settings.wifi.WifiDialogActivity.KEY_ACCESS_POINT_STATE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -42,9 +43,6 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 
-import androidx.slice.SliceProvider;
-import androidx.slice.widget.SliceLiveData;
-
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.WifiTracker;
@@ -57,7 +55,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -85,14 +82,11 @@
         mResolver = mock(ContentResolver.class);
         doReturn(mResolver).when(mContext).getContentResolver();
         mWifiManager = mContext.getSystemService(WifiManager.class);
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
         mWifiManager.setWifiEnabled(true);
 
         mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
         mWifiScanWorker = new WifiScanWorker(mContext, WIFI_SLICE_URI);
-        mConnectToWifiHandler = Robolectric.setupActivity(ConnectToWifiHandler.class);
+        mConnectToWifiHandler = new ConnectToWifiHandler();
     }
 
     @After
@@ -147,42 +141,36 @@
         verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
     }
 
-    private void setConnectionInfoSSID(String ssid) {
-        final WifiInfo wifiInfo = new WifiInfo();
-        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(ssid));
-        ShadowWifiManager.get().setConnectionInfo(wifiInfo);
-    }
-
     @Test
-    public void NetworkCallback_onCapabilitiesChanged_isClickedWifi_shouldStartActivity() {
-        final AccessPoint accessPoint = createAccessPoint("ap1");
+    public void NetworkCallback_onCapabilitiesChanged_isClickedWifi_shouldSendBroadcast() {
+        final Intent intent = getIntentWithAccessPoint("ap1");
         setConnectionInfoSSID("ap1");
         final Network network = mConnectivityManager.getActiveNetwork();
         mWifiScanWorker.registerNetworkCallback(network);
 
-        mConnectToWifiHandler.connect(accessPoint);
+        mConnectToWifiHandler.onReceive(mContext, intent);
         mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
                 WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext).startActivityAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
     }
 
     @Test
-    public void NetworkCallback_onCapabilitiesChanged_isNotClickedWifi_shouldNotStartActivity() {
-        final AccessPoint accessPoint = createAccessPoint("ap1");
+    public void NetworkCallback_onCapabilitiesChanged_isNotClickedWifi_shouldNotSendBroadcast() {
+        final Intent intent = getIntentWithAccessPoint("ap1");
         setConnectionInfoSSID("ap2");
         final Network network = mConnectivityManager.getActiveNetwork();
         mWifiScanWorker.registerNetworkCallback(network);
 
-        mConnectToWifiHandler.connect(accessPoint);
+        mConnectToWifiHandler.onReceive(mContext, intent);
         mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
                 WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext, never()).startActivityAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
     }
 
     @Test
-    public void NetworkCallback_onCapabilitiesChanged_neverClickWifi_shouldNotStartActivity() {
+    public void NetworkCallback_onCapabilitiesChanged_neverClickWifi_shouldNotSendBroadcast() {
         setConnectionInfoSSID("ap1");
         final Network network = mConnectivityManager.getActiveNetwork();
         mWifiScanWorker.registerNetworkCallback(network);
@@ -190,24 +178,36 @@
         mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
                 WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext, never()).startActivityAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
     }
 
     @Test
-    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldNotStartActivity() {
-        final AccessPoint accessPoint = createAccessPoint("ap1");
+    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldNotSendBroadcast() {
+        final Intent intent = getIntentWithAccessPoint("ap1");
         setConnectionInfoSSID("ap1");
         final Network network = mConnectivityManager.getActiveNetwork();
         mWifiScanWorker.registerNetworkCallback(network);
         final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
 
         mWifiScanWorker.onSlicePinned();
-        mConnectToWifiHandler.connect(accessPoint);
+        mConnectToWifiHandler.onReceive(mContext, intent);
         mWifiScanWorker.onSliceUnpinned();
         callback.onCapabilitiesChanged(network,
                 WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext, never()).startActivityAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+    }
+
+    static Intent getIntentWithAccessPoint(String ssid) {
+        final Bundle savedState = new Bundle();
+        savedState.putString("key_ssid", ssid);
+        return new Intent().putExtra(KEY_ACCESS_POINT_STATE, savedState);
+    }
+
+    static void setConnectionInfoSSID(String ssid) {
+        final WifiInfo wifiInfo = new WifiInfo();
+        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(ssid));
+        ShadowWifiManager.get().setConnectionInfo(wifiInfo);
     }
 
     private AccessPoint createAccessPoint(String ssid, DetailedState detailedState) {
@@ -223,10 +223,6 @@
         return createAccessPoint("ap", detailedState);
     }
 
-    private AccessPoint createAccessPoint(String ssid) {
-        return createAccessPoint(ssid, DetailedState.DISCONNECTED);
-    }
-
     @Implements(WifiTracker.class)
     public static class ShadowWifiTracker {
         @Implementation
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index fabc50e..18ed006 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -238,20 +238,13 @@
         setWorkerResults(createAccessPoint(AP1_NAME, true, true));
         doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager)
                 .getNetworkCapabilities(any());
+        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+                R.drawable.ic_settings_accent);
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
 
         SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        assertCaptivePortalItems(sliceItems);
-    }
-
-    private void assertCaptivePortalItems(List<SliceItem> sliceItems) {
-        final String expectedSummary = mContext.getString(R.string.switch_on_text);
-        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems, expectedSummary);
-
-        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_settings_accent);
         SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon);
     }