diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9518b89..35e8c65 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -422,7 +422,7 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.ApnSettings" />
+                       android:value="com.android.settings.network.apn.ApnSettings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -511,6 +511,16 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
+                  android:exported="false"
+                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+                  android:theme="@style/Transparent" />
+
+        <activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"
+                  android:exported="false"
+                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+                  android:theme="@style/Transparent" />
+
         <activity
             android:name="Settings$TetherSettingsActivity"
             android:label="@string/tether_settings_title_all"
@@ -1998,7 +2008,7 @@
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.ApnEditor" />
+                       android:value="com.android.settings.network.apn.ApnEditor" />
         </activity>
 
         <activity
@@ -2010,6 +2020,7 @@
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
diff --git a/OWNERS b/OWNERS
index 47961cd..cc683ce 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,6 +2,7 @@
 android-settings-core-eng+gerrit@google.com
 
 # People who can approve changes for submission
+arcwang@google.com
 chiujason@google.com
 edgarwang@google.com
 emilychuang@google.com
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 22b9ad4..b138082 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -265,8 +265,8 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;notification_history_background&quot;>#5F6368&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    &lt;color name=&quot;notification_history_background&quot;>#202124&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-night/colors.xml"
             line="30"
@@ -1325,7 +1325,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="137"
+            line="138"
             column="5"/>
     </issue>
 
@@ -1341,7 +1341,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="138"
+            line="139"
             column="5"/>
     </issue>
 
@@ -1357,7 +1357,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="139"
+            line="140"
             column="5"/>
     </issue>
 
@@ -1373,7 +1373,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="148"
+            line="149"
             column="5"/>
     </issue>
 
@@ -1389,7 +1389,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="150"
+            line="151"
             column="5"/>
     </issue>
 
@@ -1405,7 +1405,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="154"
+            line="155"
             column="5"/>
     </issue>
 
@@ -1421,7 +1421,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="155"
+            line="156"
             column="5"/>
     </issue>
 
@@ -1437,7 +1437,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="156"
+            line="157"
             column="5"/>
     </issue>
 
@@ -1453,7 +1453,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="157"
+            line="158"
             column="5"/>
     </issue>
 
@@ -1469,7 +1469,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="158"
+            line="159"
             column="5"/>
     </issue>
 
@@ -1485,7 +1485,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="159"
+            line="160"
             column="5"/>
     </issue>
 
@@ -1501,7 +1501,23 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="160"
+            line="161"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;palette_list_color_gray&quot;>#80868b&lt;/color> &lt;!-- Material Gray 600 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="162"
             column="5"/>
     </issue>
 
@@ -1517,7 +1533,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="163"
+            line="165"
             column="5"/>
     </issue>
 
@@ -1533,7 +1549,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="164"
+            line="166"
             column="5"/>
     </issue>
 
@@ -1549,7 +1565,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="165"
+            line="167"
             column="5"/>
     </issue>
 
@@ -1565,7 +1581,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="166"
+            line="168"
             column="5"/>
     </issue>
 
@@ -1581,7 +1597,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="167"
+            line="169"
             column="5"/>
     </issue>
 
@@ -1597,7 +1613,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="168"
+            line="170"
             column="5"/>
     </issue>
 
@@ -1613,7 +1629,23 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="169"
+            line="171"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;palette_list_dark_mode_color_gray&quot;>#dadce0&lt;/color> &lt;!-- Material Gray 300 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="172"
             column="5"/>
     </issue>
 
@@ -1629,7 +1661,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="172"
+            line="175"
             column="5"/>
     </issue>
 
@@ -1645,7 +1677,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="173"
+            line="176"
             column="5"/>
     </issue>
 
@@ -1661,7 +1693,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="174"
+            line="177"
             column="5"/>
     </issue>
 
@@ -1677,7 +1709,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="175"
+            line="178"
             column="5"/>
     </issue>
 
@@ -1693,7 +1725,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="176"
+            line="179"
             column="5"/>
     </issue>
 
@@ -1709,7 +1741,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="177"
+            line="180"
             column="5"/>
     </issue>
 
@@ -1725,7 +1757,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="180"
+            line="183"
             column="5"/>
     </issue>
 
@@ -1741,7 +1773,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="181"
+            line="184"
             column="5"/>
     </issue>
 
@@ -1757,7 +1789,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="182"
+            line="185"
             column="5"/>
     </issue>
 
@@ -1773,7 +1805,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="183"
+            line="186"
             column="5"/>
     </issue>
 
@@ -1789,7 +1821,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="184"
+            line="187"
             column="5"/>
     </issue>
 
@@ -1805,7 +1837,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="185"
+            line="188"
             column="5"/>
     </issue>
 
@@ -2361,6 +2393,38 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_night_display.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_notification.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:color=&quot;@color/homepage_privacy_background&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2473,38 +2537,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_homepage_night_display.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_homepage_notification.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                    android:color=&quot;@color/notification_block_color&quot;/>"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -3033,27 +3065,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
-        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-en-rXC/strings.xml"
-            line="2763"
-            column="170"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2765"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -3069,7 +3085,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2765"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -3085,7 +3101,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2765"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -3101,7 +3117,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2765"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -3113,11 +3129,27 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
+        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="2793"
+            column="170"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>Welcome to Google sync!&lt;/font>"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6408"
+            line="6463"
             column="36"/>
     </issue>
 
@@ -3133,7 +3165,7 @@
         errorLine2="                                        ^">
         <location
             file="res/values/styles.xml"
-            line="202"
+            line="201"
             column="41"/>
     </issue>
 
@@ -3149,7 +3181,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="417"
+            line="428"
             column="44"/>
     </issue>
 
@@ -3165,7 +3197,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="423"
+            line="434"
             column="44"/>
     </issue>
 
@@ -3181,7 +3213,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="424"
+            line="435"
             column="44"/>
     </issue>
 
@@ -3197,7 +3229,7 @@
         errorLine2="                                 ^">
         <location
             file="res/values/styles.xml"
-            line="460"
+            line="471"
             column="34"/>
     </issue>
 
@@ -3465,22 +3497,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="          android:background=&quot;@color/divider_color&quot; />"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/user_info_header.xml"
-            line="128"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    android:background=&quot;@color/gestures_setting_background_color&quot;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/res/layout/adb_qrcode_scanner_fragment.xml b/res/layout/adb_qrcode_scanner_fragment.xml
index f37c9a6..9a337d9 100644
--- a/res/layout/adb_qrcode_scanner_fragment.xml
+++ b/res/layout/adb_qrcode_scanner_fragment.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/GlifV3Theme.Light"
+    android:theme="@style/GlifV3Theme"
     android:icon="@drawable/ic_scan_32dp">
 
     <LinearLayout
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 0c9374f..3f1b3d3 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -64,4 +64,15 @@
             android:layout_marginStart="4dp"/>
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/bt_battery_prediction"
+        style="@style/TextAppearance.EntityHeaderSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
deleted file mode 100644
index 2bd464b..0000000
--- a/res/layout/edit_user_info_dialog_content.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:baselineAligned="false"
-    android:padding="16dip">
-
-    <ImageView
-        android:id="@+id/user_photo"
-        android:layout_width="56dip"
-        android:layout_height="56dip"
-        android:layout_gravity="bottom"
-        android:contentDescription="@string/user_image_photo_selector"
-        android:background="@*android:drawable/spinner_background_holo_dark"
-        android:scaleType="fitCenter"/>
-
-    <EditText
-        android:id="@+id/user_name"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_marginStart="6dp"
-        android:minHeight="@dimen/min_tap_target_size"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart"
-        android:inputType="text|textCapWords"
-        android:selectAllOnFocus="true"
-        android:hint="@string/user_nickname"
-        android:maxLength="100"/>
-
-</LinearLayout>
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
deleted file mode 100644
index 636e3f9..0000000
--- a/res/layout/restricted_popup_menu_item.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip">
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorAlertDialogListItem"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        android:ellipsize="marquee"
-        android:layout_alignParentLeft="true" />
-    <ImageView
-        android:id="@+id/restricted_icon"
-        android:layout_width="@*android:dimen/config_restrictedIconSize"
-        android:layout_height="@*android:dimen/config_restrictedIconSize"
-        android:scaleType="centerInside"
-        android:tint="?android:attr/colorAccent"
-        android:src="@*android:drawable/ic_info"
-        android:layout_alignParentRight="true"
-        android:visibility="gone" />
-</RelativeLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8a9c269..8ac6f96 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skermslot, gesigslot"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skermslot, vingerafdruk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skermslot"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ontsluit jou foon veilig met jou gesig en vingerafdruk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Jy kan ook by programme aanmeld en betaling bevestig"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Stel ontsluit op met:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Gesigslot"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Maak dit maklik om jou foon te ontsluit"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vingerafdruk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Bespaar tyd en ontsluit foon in jou sak"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Slaan oor"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Volgende"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gesig is bygevoeg"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Stel gesigslot op"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Gesigslot"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jy kan nie jou vingerafdruk gebruik om hierdie toestel te ontsluit nie. Gebruik jou organisasie se administrateur vir meer inligting."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jou vingerafdruk kan dalk minder veilig as \'n sterk patroon of PIN wees."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselleer"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee, dankie"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Gaan voort"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Slaan oor"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"As jy jou tablet met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"As jy jou toestel met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"As jy jou foon met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"As jy jou tablet met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"As jy jou toestel met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"As jy jou foon met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Slaan PIN-opstelling oor?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Slaan wagwoordopstelling oor?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Slaan patroonopstelling oor?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Stel jou rugsteunskermslotmetode op"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Kies jou rugsteunmetode vir skermsluiting"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Skermslotopsies"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Skermslotopsies"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skermslot"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Gesigslot + wagwoord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Gaan voort sonder gesigslot"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Jy kan jou foon met jou gesig ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrie + patroon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrie + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrie + wagwoord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Gaan voort sonder biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Jy kan jou biometrie gebruik om jou foon te ontsluit. Om veiligheidsredes vereis hierdie opsie \'n rugsteunskermslot."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swiep"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Toestel se MAC-adres"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ewekansige MAC-adres"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adres"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netwerkbesonderhede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetmasker"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Voer \'n geldige deurgangadres in."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Voer \'n geldige DNS-adres in."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Voer \'n netwerkvoorvoegsel in met lengte tussen 0 en 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tensy deur private DNS geïgnoreer)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tensy deur private DNS geïgnoreer)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Deurgang"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengte van netwerkvoorvoegsel"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Stel wagwoord om gesigslot te gebruik"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Stel patroon om gesigslot te gebruik"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Stel PIN om gesigslot te gebruik"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Stel wagwoord om biometrie te gebruik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Stel patroon om biometrie te gebruik"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Stel PIN om biometrie te gebruik"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Jou wagwoord vergeet?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Jou patroon vergeet?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Jou PIN vergeet?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nie opgestel nie – werkprofiel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Jy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Bynaam"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Jy kan tot <xliff:g id="USER_COUNT">%1$d</xliff:g> gebruikers byvoeg"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Net die eienaar van die tablet kan gebruikers bestuur."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Net die eienaar van die foon kan gebruikers bestuur."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Terug"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Volgende"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Klaar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Neem \'n foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Kies \'n prent"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Kies foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kaarte"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kaarte"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die PIN vereis om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die patroon vereis om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die wagwoord vereis om jou toestel te begin?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis patroon om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nee"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Beperk"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Onbeskikbaar wanneer gekoppel aan <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Sien meer"</string>
     <string name="see_less" msgid="2642392725363552793">"Sien minder"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Skakel <xliff:g id="CARRIER_NAME">%1$s</xliff:g> af?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Skakel SIM af?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Skakel tans SIM af <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan nie diensverskaffer deaktiveer nie"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Iets was fout en jou diensverskaffer kon nie gedeaktiveer word nie."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Koppel aan toestel"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g>-program wil \'n tydelike Wi‑Fi-netwerk gebruik om aan jou toestel te koppel"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Geen toestelle gekry nie. Maak seker dat toestelle aangeskakel is en beskikbaar is om te koppel."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e055add..b3b006b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ማያ ገጽ መቆለፊያ፣ የፊት መክፈቻ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"የማያ ገጽ ቁልፍ፣ የጣት አሻራ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ማሳያ መቆለፊያ"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"በእርስዎ መልክ እና የጣት አሻራ የእርስዎን ስልክ ደህንነቱ ተጠብቆ ይክፈቱት"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"እንዲሁም በመለያ ወደ መተግበሪያዎች መግባት እና ክፍያን ማረጋገጥ ይችላሉ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"መክፈትን በዚህ ያቀናብሩ፦"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"በመልክ መክፈት"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"የእርስዎን ስልክ መክፈት የአፍታ ጉዳይ ያድርጉት"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"የጣት አሻራ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"በእርስዎ ኪስ ውስጥ ስልክዎን በመክፈት ጊዜ ይቆጥቡ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ዝለል"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ቀጣይ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"መልክ ታክሏል"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"በመልክ መክፈቻን ያቀናብሩ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"በመልክ መክፈት"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት የጣት አሻራን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ይቅር"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"አይ፣ አመሰግናለሁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ቀጥል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ዝለል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ቀጣይ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"የእርስዎን ጡባዊ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"የእርስዎን መሣሪያ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"የእርስዎን ስልክ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"የእርስዎን ጡባዊ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"የእርስዎን መሣሪያ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"የእርስዎን ስልክ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"የፒን ቅንብር ይዘለል?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"የይለፍ ቃል ቅንብር ይዘለል?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"የሥርዓተ ጥለት ቅንብር ይዘለል?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ጡባዊ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"የእርስዎን ማያ ገጽ መቆለፊያ ስልት ምትኬ ያቀናብሩ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"የምትኬ ማያ ገጽ መቆለፊያ ስልትዎን ይምረጡ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ማሳያ መቆለፊያ"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"በመልክ መክፈቻ + የይለፍ ቃል"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ያለመልክ መክፈቻ ይቀጥሉ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"የእርስዎን መልክ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ባዮሜትሪክስ + ስርዓተ ጥለት"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ባዮሜትሪክስ + ፒን"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ባዮሜትሪክስ + የይለፍ ቃል"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ያለባዮሜትሪክስ ቀጥል"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"የእርስዎን ባዮሜትሪክስ በመጠቀም ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የምትኬ የማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"በአስተዳዳሪ፣ የምስጠራ መመሪያ ወይም የምስክርነት ማከማቻ ተሰናክሏል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ማንሸራተት"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"ኤስኤስአይዲ"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"የመሣሪያ ማክ አድራሻ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"የዘፈቀደ የተደረገ የማክ አድራሻ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP አድራሻ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"የአውታረ መረብ ዝርዝሮች"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"የንዑስ አውታር ጭንብል"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"እባክህ ትክክለኛ ኣግባቢ ፍኖት አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"እባክህ ትክክለኛ dns አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"እባክህ በ0 እና 32 መካከል የአውታረ መረብ ቅድመ ቅጥያ ርዝመት ተይብ።"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ዲኤንኤስ 1 (በግል ዲኤንኤስ ቅድሚያ ካልተወሰደበት በስተቀር)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ዲኤንኤስ 2 (በግል ዲኤንኤስ ቅድሚያ ካልተወሰደበት በስተቀር)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"መውጫ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"የአውታረ መረብ ቅድመ ቅጥያ ርዝመት"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"በመልክ መክፈቻን ለመጠቀም የይለፍ ቃል ይጠቀሙ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"በመልክ መክፈትን ለመጠቀም ስርዓተ-ጥለትን ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"በመልክ መክፈቻን ለመጠቀም ፒን ያቀናብሩ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ባዮሜትሪክስን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ባዮሜትሪክስን ለመጠቀም ሥርዓተ ጥለት ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ባዮሜትሪክስን ለመጠቀም ፒን ያቀናብሩ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"የእርስዎን የይለፍ ቃል ረሱት?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"የእርስዎን ስርዓተ-ጥለት ረሱት?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"የእርስዎን ፒን ረሱት?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"አልተዋቀረም - የስራ መገለጫ"</string>
     <string name="user_admin" msgid="4024553191395768119">"አስተዳዳሪ"</string>
     <string name="user_you" msgid="3070562015202859996">"እርስዎ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ቅጽል ስም"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"እስከ <xliff:g id="USER_COUNT">%1$d</xliff:g> ተጠቃሚዎች ማከል ይችላሉ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"የጡባዊው ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"የስልኩ ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ተመለስ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ቀጣይ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ተጠናቅቋል"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ፎቶ አንሳ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ምስል ይምረጡ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ፎቶ ምረጥ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ሲም ካርዶች"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ሲም ካርዶች"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ስርዓተ-ጥለት ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ የውሂብ ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ኮድ ይጠየቅ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ሥርዓተ ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር ሥርዓተ ጥለት ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስነሳት የይለፍ ቃል ይጠየቅ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"አዎ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"የለም"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ተገድቧል"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ከ<xliff:g id="CARRIER">%1$s</xliff:g> ጋር ሲገናኝ የማይገኝ"</string>
     <string name="see_more" msgid="7499355691042812723">"ተጨማሪ ይመልከቱ"</string>
     <string name="see_less" msgid="2642392725363552793">"ያነሰ ይመልከቱ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይጥፋ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ሲም ይጥፋ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ሲምን በማጥፋት ላይ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"አገልግሎት አቅራቢን ማሰናከል አልተቻለም"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"የሆነ ችግር ተፈጥሯል፣ እና የእርስዎ አገልግሎት አቅራቢ ሊሰናከል አልቻለም።"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ከመሣሪያ ጋር ያገናኙ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"የ<xliff:g id="APPNAME">%1$s</xliff:g> መተግበሪያ ከመሣሪያዎ ጋር ለመገናኘት ጊዜያዊ የWi‑Fi አውታረ መረብን መጠቀም ይፈልጋል"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ምንም መሣሪያዎች አልተገኙም መሣሪያዎች እንደበሩ እና ለመገናኘት የሚገኝ መሆኑን ያረጋግጡ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5600935..7c1e54d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -332,24 +332,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل الشاشة، فتح القفل بالوجه"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل الشاشة، بصمة الإصبع"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"قفل الشاشة"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"فتح قفل هاتفك بأمان باستخدام وجهك وبصمة إصبعك"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"يمكنك أيضًا تسجيل الدخول إلى التطبيقات وتأكيد الدفع"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"إعداد فتح القفل باستخدام:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"فتح القفل بالوجه"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"تسهيل عملية فتح قفل الهاتف"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"بصمة الإصبع"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"توفير الوقت وفتح قفل الهاتف في جيبك"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"التخطي"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"التالي"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"تمت إضافة الوجه"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"إعداد ميزة \"فتح القفل بالوجه\""</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"فتح القفل بالوجه"</string>
@@ -431,8 +422,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام بصمة الإصبع لفتح قفل هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"إلغاء"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"لا، شكرًا"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"متابعة"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"التخطي"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"التالي"</string>
@@ -470,12 +460,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"لن يتمكّن أحد من استخدام جهازك اللوحي في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". وللرجوع، انتقِل إلى \"إلغاء\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"لن يتمكّن أحد من استخدام جهازك في حال فقدانه أو سرقته عندما تحميه بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". وللرجوع، انتقِل إلى \"إلغاء\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"لن يتمكّن أحد من استخدام هاتفك في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". للرجوع، انقر على \"إلغاء\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"لن يتمكّن أحد من استخدام جهازك اللوحي في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"لن يتمكّن أحد من استخدام جهازك في حال فقدانه أو سرقته عندما تحميه بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"لن يتمكّن أحد من استخدام هاتفك في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"أتريد تخطي إعداد رقم التعريف الشخصي؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"أتريد تخطّي إعداد كلمة المرور؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"هل تريد تخطّي إعداد النقش؟"</string>
@@ -548,7 +535,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"يمكنك منع الآخرين من استخدام هذا الجهاز اللوحي بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"إعداد الطريقة الاحتياطية لقفل الشاشة"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"خيارات قفل الشاشة"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"خيارات قفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"قفل الشاشة"</string>
@@ -580,16 +567,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"\"فتح القفل بالوجه\" مع كلمة المرور"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"المتابعة بدون إعداد \"فتح القفل بالوجه\""</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"المقاييس الحيوية + النقش"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"المقاييس الحيوية + رقم التعريف الشخصي"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"المقاييس الحيوية + كلمة المرور"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"المتابعة بدون استخدام مقاييس حيوية"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"يمكنك فتح قفل هاتفك باستخدام المقاييس الحيوية. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"تم إيقافه بواسطة المشرف، أو سياسة التشفير، أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"بدون قفل"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"التمرير السريع"</string>
@@ -1111,6 +1093,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏عنوان MAC للجهاز"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏عنوان MAC العشوائي"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏عنوان IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"تفاصيل الشبكة"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"قناع الشبكة الفرعية"</string>
@@ -1128,8 +1112,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"اكتب عنوان بوابة صالحًا."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"اكتب عنوان نظام أسماء نطاقات صالحًا."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"اكتب بادئة شبكة يترواح طولها بين 0 و32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"نظام أسماء النطاقات 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"نظام أسماء النطاقات 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"نظام أسماء النطاقات 1 (ما لم يتم إلغاؤها باستخدام نظام أسماء النطاقات الخاص)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"نظام أسماء النطاقات 2 (ما لم يتم إلغاؤها باستخدام نظام أسماء النطاقات الخاص)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"البوابة"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"طول بادئة الشبكة"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏اتصال Wi-Fi مباشر"</string>
@@ -1901,12 +1885,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"لاستخدام \"فتح القفل بالوجه\"، يجب تحديد كلمة مرور"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"لاستخدام \"فتح القفل بالوجه\"، يجب تحديد نقش."</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"‏لاستخدام \"فتح القفل بالوجه\"، يجب تحديد رقم PIN."</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"هل نسيت كلمة المرور؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"هل نسيت النقش؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"هل نسيت رقم التعريف الشخصي؟"</string>
@@ -2232,7 +2213,7 @@
     <string name="app_name_label" msgid="3809910527680143673">"التطبيق"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"آخر مرة تم استخدامه"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"وقت الاستخدام"</string>
-    <string name="accessibility_settings" msgid="4713215774904704682">"إمكانية الوصول"</string>
+    <string name="accessibility_settings" msgid="4713215774904704682">"تسهيل الاستخدام"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"إعدادات \"سهولة الاستخدام\""</string>
     <string name="accessibility_settings_summary" msgid="2195085206729325737">"أجهزة قارئ الشاشة والشاشة وعناصر التحكم التفاعلية"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"إعدادات الرؤية"</string>
@@ -2287,7 +2268,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"لاستخدام إحدى ميزات إمكانية الوصول، مرّر سريعًا من أسفل الشاشة للأعلى بثلاثة أصابع.\n\nللتبديل بين الميزات، مرّر سريعًا للأعلى بثلاثة أصابع مع تثبيتها."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"حسنًا"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"اختصار <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
-    <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"زر تسهيل الاستخدام"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"التمرير بسرعة إلى الأعلى بإصبعين"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"التمرير بسرعة إلى الأعلى بثلاثة أصابع"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"النقر على زر أدوات تمكين الوصول"</string>
@@ -2357,7 +2338,7 @@
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"حجم النص: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"خيارات أكثر"</string>
     <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"لا تتوفّر هذه الإعدادات المفضّلة للشرح في بعض التطبيقات."</string>
-    <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"زر تسهيل الاستخدام"</string>
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"التمرير سريعًا بإصبعين إلى أعلى الشاشة من أسفلها"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"الضغط مع الاستمرار على مفتاحَي التحكّم بمستوى الصوت"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"النقر ثلاث مرات على الشاشة"</string>
@@ -3223,7 +3204,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"لم يتم الإعداد - الملف الشخصي للعمل"</string>
     <string name="user_admin" msgid="4024553191395768119">"المشرف"</string>
     <string name="user_you" msgid="3070562015202859996">"أنت (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"اللقب"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"يمكنك إضافة ما يصل إلى <xliff:g id="USER_COUNT">%1$d</xliff:g> من المستخدمين"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"يمكن لمالك الجهاز اللوحي فقط إدارة المستخدمين."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"يمكن لمالك الهاتف فقط إدارة المستخدمين."</string>
@@ -3343,9 +3323,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"رجوع"</string>
     <string name="wizard_next" msgid="3884832431439072471">"التالي"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"إنهاء"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"التقاط صورة"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"اختيار صورة"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"اختيار صورة"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏بطاقات SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏بطاقات SIM"</string>
@@ -4022,7 +3999,7 @@
     <string name="zen_mode_media_list_first" msgid="7824427062528618442">"الوسائط"</string>
     <string name="zen_mode_system" msgid="7301665021634204942">"أصوات اللمس"</string>
     <string name="zen_mode_system_summary" msgid="7225581762792177522">"الأصوات من لوحة المفاتيح والأزرار الأخرى"</string>
-    <string name="zen_mode_system_list" msgid="2256218792042306434">"أصوات اللمس"</string>
+    <string name="zen_mode_system_list" msgid="2256218792042306434">"اللمس"</string>
     <string name="zen_mode_system_list_first" msgid="8590078626001067855">"اللمس"</string>
     <string name="zen_mode_reminders" msgid="1970224691551417906">"التذكيرات"</string>
     <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"من المهام والتنبيهات"</string>
@@ -4125,12 +4102,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"بالإضافة إلى استخدام وجهك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"بالإضافة إلى استخدام وجهك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال النقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال النقش لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"بالإضافة إلى استخدام وجهك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل جهازك، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال رقم تعريف شخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم تعريف شخصي لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل جهازك، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال نقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال نقش لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة مرور لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"نعم"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"لا"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محظور"</string>
@@ -5181,6 +5155,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"عدم التوفُّر عند الربط بمشغّل شبكة الجوّال <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"عرض المزيد"</string>
     <string name="see_less" msgid="2642392725363552793">"عرض عناصر أقل"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"هل تريد إيقاف <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏هل تريد إيقاف شريحة SIM؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏جارٍ إيقاف شريحة SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"يتعذّر إيقاف مشغِّل شبكة الجوّال"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"حدث خطأ ما أدى إلى تعذُّر إيقاف مشغِّل شبكة الجوّال."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"الاتصال بالجهاز"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏يريد تطبيق <xliff:g id="APPNAME">%1$s</xliff:g> استخدام شبكة Wi‑Fi مؤقتة للاتصال بجهازك."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"لم يتمّ العثور على أيّ أجهزة. تأكَّد من تشغيل الأجهزة وتوفّرها للاتصال."</string>
@@ -5214,7 +5193,7 @@
     <string name="contextual_card_removed_message" msgid="5755438207494260867">"تمت إزالة الاقتراح."</string>
     <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"تراجع"</string>
     <string name="low_storage_summary" msgid="1979492757417779718">"مساحة التخزين منخفضة. <xliff:g id="PERCENTAGE">%1$s</xliff:g> مُستخدَمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
-    <string name="contextual_card_feedback_send" msgid="7409408664417908922">"إرسال تعليقات"</string>
+    <string name="contextual_card_feedback_send" msgid="7409408664417908922">"إرسال ملاحظات وآراء"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"هل ترغب في إرسال تعليقات إلينا بشأن هذا الاقتراح؟"</string>
     <string name="copyable_slice_toast" msgid="1008251852798990606">"تمّ نسخ <xliff:g id="COPY_CONTENT">%1$s</xliff:g> إلى الحافظة."</string>
     <string name="search_bar_account_avatar_content_description" msgid="880523277036898350"></string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index ac0c1b0..f839d84 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্ৰীণ লক, ফে’চ আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্ৰীণ লক, ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"স্ক্ৰীণ লক"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"আপোনাৰ মুখাৱয়ব আৰু ফিংগাৰপ্ৰিণ্টেৰে নিজৰ ফ’ন সুৰক্ষিতভাৱে আনলক কৰক"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"আপুনি এপত ছাইন ইন কৰিও পৰিশোধ নিশ্চিত কৰিব পাৰে"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ইয়াৰ জৰিয়তে আনলক ছেট আপ কৰক:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"মুখাৱয়বৰ দ্বাৰা আনলক"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"আপোনাৰ ফ’নটো আনলক কৰাটো একেবাৰে সহজ কৰক"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ফিংগাৰপ্ৰিণ্ট"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"আপোনাৰ পকেটত ফ’নটো আনলক কৰি সময় ৰাহি কৰক"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"এৰি যাওক"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"পৰৱৰ্তী"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"চেহেৰা যোগ কৰা হ\'ল"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধা ছেটআপ কৰক"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"মুখাৱয়বৰদ্বাৰা আনলক"</string>
@@ -397,6 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ বা ক্ৰয়ৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক৷\n\nটোকা: আপুনি এই ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব নোৱাৰে৷ অধিক তথ্যৰ বাবে, আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ লগত যোগাযোগ কৰক৷"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপোনাৰ ফিংগাৰপ্ৰিণ্টটো ব্যৱহাৰ কৰি আপোনাৰ ফ’নটো আনলক কৰক বা ক্ৰয়ত অনুমোদন দিয়ক।\n\nটোকা: এটা জটিল আৰ্হি বা পিনতকৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো কম সুৰক্ষিত হ’ব পাৰে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল কৰক"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"নালাগে, ধন্যবাদ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চলাই ৰাখক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এৰি যাওক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পৰৱৰ্তী"</string>
@@ -434,6 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"আপোনাৰ টেবলেটটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"আপোনাৰ ডিভাইচটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"আপোনাৰ ফ’নটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"আপোনাৰ টেবলেটটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"আপোনাৰ ডিভাইচটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"আপোনাৰ ফ’নটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"পিন ছেট আপ নকৰাকৈ এৰি যাবনে?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"পাছৱৰ্ড ছেট আপ এৰি যাব নেকি?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"আৰ্হি ছেট আপ এৰি যাব নেকি?"</string>
@@ -506,8 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনে এই টেবলেটটো ব্যৱহাৰ কৰাৰ পৰা বাৰণ কৰক।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনে এই টে\'বলেটটো ব্যৱহাৰ কৰিব নোৱাৰা কৰক। আপুনি ব্যৱহাৰ কৰিব বিচৰা স্ক্ৰীণ লকটো নিৰ্বাচন কৰক৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনক এই ফ\'নটো ব্যৱহাৰ কৰাৰ পৰা বাৰণ কৰক৷ আপুনি ব্যৱহাৰ কৰিবলৈ বিচৰা স্ক্ৰীণ লকটো নিৰ্বাচন কৰক৷"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"আপোনাৰ বেকআপ স্ক্ৰীণ লক পদ্ধতি নিৰ্বাচন কৰক"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"আপোনাৰ বেক আপ স্ক্ৰীণ লক পদ্ধতি নিৰ্বাচন কৰক"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"বেকআপ হিচাপে ব্যৱহাৰ কৰিবলৈ আপোনাৰ স্ক্ৰীন লক পদ্ধতিটো বাছনি কৰক"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"স্ক্ৰীণ লক সম্পৰ্কীয় বিকল্প"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"স্ক্ৰীণ লক সম্পৰ্কীয় বিকল্প"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"স্ক্ৰীণ লক"</string>
@@ -539,6 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"মুখাৱয়বৰদ্বাৰা আনলক + পাছৱৰ্ড"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰি অব্যাহত ৰাখক"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"আপুনি নিজৰ চেহেৰা ব্যৱহাৰ কৰি আপোনাৰ ফ\'নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক বেক আপ স্ক্ৰীণ লকৰ প্ৰয়োজন।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"বায়’মেট্ৰিক্স + আৰ্হি"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"বায়’মেট্ৰিক্স + পিন"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"বায়’মেট্ৰিক্স + পাছৱৰ্ড"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"বায়’মেট্ৰিক্সৰ অবিহনে অব্যাহত ৰাখক"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"আপুনি নিজৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰি আপোনাৰ ফ’নটো আনলক কৰিব পাৰে। সুৰক্ষাৰ বাবে এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ আৱশ্যক হয়।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"নাই"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ছোৱাইপ কৰক"</string>
@@ -996,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ডিভাইচৰ MAC ঠিকনা"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"যাদৃচ্ছিক MAC ঠিকনা"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"আইপি ঠিকনা"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"নেটৱৰ্কৰ সবিশেষ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ছাবনেট মাস্ক"</string>
@@ -1013,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"এটা মান্য গেইটৱে\' ঠিকনা টাইপ কৰক"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"এটা মান্য ডিএনএছ ঠিকনা লিখক।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"০ আৰু ৩২ ৰ মাজৰ দৈৰ্ঘ্যৰ এটা নেটৱৰ্ক প্ৰিফিক্স টাইপ কৰক।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"ডিএনএছ ১"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"ডিএনএছ ২"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS ১ (যদিহে ব্যক্তিগত DNSএ অ’ভাৰৰাইড কৰা নাই)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS ২ (যদিহে ব্যক্তিগত DNSএ অ’ভাৰৰাইড কৰা নাই)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"গেইটৱে\'"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"নেটৱৰ্ক প্ৰিফিক্সৰ দীঘ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ৱাই-ফাই ডাইৰেক্ট"</string>
@@ -1778,6 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"মুখাৱয়বৰদ্বাৰা আনলকৰ বেক আপ ছেট কৰক"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"মুখাৱয়বৰদ্বাৰা কৰা আনলকৰ বেকআপ ছেট কৰক"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"মুখাৱয়বৰদ্বাৰা কৰা আনলকৰ বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"আপোনাৰ পাছৱর্ডটো পাহৰিলে নেকি?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"আপোনাৰ আর্হিটো পাহৰিলে নেকি?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"আপোনাৰ পিনটো পাহৰিলে নেকি?"</string>
@@ -1950,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"এপ্ অক্ষম কৰক"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"আপুনি যদি এই এপ্‌টো অক্ষম কৰে, তেন্তে Android আৰু অন্য এপ্‌সমূহে বিচৰাৰ দৰে কাম নকৰিব পাৰে। মনত ৰাখিব, আপুনি এই এপ্‌টো মচিব নোৱাৰে কাৰণ এইটো আপোনাৰ ডিভাইচত আগৰেপৰা ইনষ্টল কৰি থোৱা আছে। অক্ষম কৰি আপুনি এই এপ্‌টো অফ কৰে আৰু ইয়াক আপোনাৰ ডিভাইচৰপৰা লুকুৱায়।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"জাননীসমুহ অফ কৰিবনে?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ষ্ট’ৰ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"এপ্‌ৰ সবিশেষ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g>ৰ পৰা এপ্ ইনষ্টল কৰা হৈছে"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g>ত আৰু অধিক তথ্য"</string>
@@ -3010,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ছেট আপ কৰা হোৱা নাই - কৰ্মস্থানৰ প্ৰ’ফাইল"</string>
     <string name="user_admin" msgid="4024553191395768119">"প্ৰশাসক"</string>
     <string name="user_you" msgid="3070562015202859996">"আপুনি (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"উপনাম"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"আপুনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন লৈকে ব্যৱহাৰকাৰী যোগ কৰিব পাৰে"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"কেৱল টেবলেটৰ গৰাকীয়ে ব্যৱহাৰকাৰীসকলক পৰিচালনা কৰিব পাৰে।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"কেৱল ফ\'নটোৰ গৰাকীয়েহে ব্যৱহাৰকাৰীসকলক পৰিচালনা কৰিব পাৰে।"</string>
@@ -3130,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"উভতি যাওক"</string>
     <string name="wizard_next" msgid="3884832431439072471">"পৰৱৰ্তী"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"সমাপ্ত"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"এখন ফট’ তোলক"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"এখন প্ৰতিচ্ছবি বাছনি কৰক"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ফট\' বাছনি কৰক"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ছিম কাৰ্ডসমূহ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ছিম কাৰ্ডবোৰ"</string>
@@ -3868,6 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পিন দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত পিন দিয়াটো দৰকাৰী কৰেনে?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক আৰ্হি দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত আৰ্হি দিয়াটো দৰকাৰী কৰেনে?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পাছৱৰ্ড দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত পাছৱৰ্ড দিয়াটো দৰকাৰী কৰেনে?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পিন দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ পিন দিয়াটো দৰকাৰী কৰিবনে?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক আৰ্হি দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ আৰ্হি দিয়াটো দৰকাৰী কৰিবনে?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পাছৱৰ্ড দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ পাছৱৰ্ড দিয়াটো দৰকাৰী কৰিবনে?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"হয়"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"নহয়"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"সীমিত"</string>
@@ -4810,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিলে উপলব্ধ নহয়"</string>
     <string name="see_more" msgid="7499355691042812723">"অধিক চাওক"</string>
     <string name="see_less" msgid="2642392725363552793">"কমকৈ চাওক"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> অফ কৰিবনে?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ছিম অফ কৰিবনে?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ছিম অফ কৰি থকা হৈছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"বাহকক অক্ষম কৰিব নোৱাৰি"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কিবা ভুল হ’ল আৰু সেয়ে আপোনাৰ বাহকক অক্ষম কৰিব পৰা নগ’ল।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ডিভাইচৰ সৈতে সংযোগ কৰক"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> এপ্‌টোৱে আপোনাৰ ডিভাইচটোৰ সৈতে সংযোগ কৰিবলৈ এটা অস্থায়ী ৱাই-ফাই নেটৱৰ্ক ব্যৱহাৰ কৰিব বিচাৰিছে"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"কোনো ডিভাইচ বিচাৰি পোৱা নগ’ল। ডিভাইচ যাতে অন হৈ থাকে আৰু সংযোগ কৰিব পৰাকৈ উপলব্ধ থাকে সেইয়া নিশ্চিত কৰক।"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 36b4d83..008950c 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, üzün kiliddən çıxarılması"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, barmaq izi"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran kilidi"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Telefonunuzu üzünüz və barmaq izinizlə etibarlı şəkildə kiliddən çıxara bilərsiniz"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Tətbiqlərdə hesabınıza daxil ola və ödənişi təsdiqləyə bilərsiniz"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Kiliddən çıxarmanı bununla quraşdırın:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Üz ilə kiliddən çıxarma"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonunuzu kiliddən çıxarmağı asanlaşdırın"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Barmaq izi"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefonunuzu cibinizdə olarkən kiliddən çıxarmaqla vaxta qənaət edin"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ötür"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Növbəti"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Üz əlavə edildi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Üz kilidi ayarlayın"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Üz kilidi"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiq etmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Bu cihazı kiliddən çıxarmaq üçün barmaq izindən istifadə edə bilməzsiniz. Ətraflı məlumat üçün təşkilat admini ilə əlaqə saxlayın."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiqləmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Barmaq izi güclü nümunə və ya PIN\'dən daha az təhlükəsiz ola bilər."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ləğv edin"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Xeyr, təşəkkürlər"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ötürün"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Növbəti"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Planşetinizi ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Cihazınızı ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonunuzu ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Planşetinizi ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Cihazınızı ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonunuzu ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN ayarlanmasını keçmək istəyirsiniz?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Parol ayarlanmasını keçmək istəyirsən?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Model ayarlanmasını keçmək istəyirsiniz?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Arxa fon ekran kilidi metodunu ayarlayın"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ehtiyat ekran kilidi üsulunu seçin"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekran kilidi seçimləri"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekran kilidi seçimləri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekran kilidi"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Üz kilidi + parol"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Üz kilidi olmadan davam edin"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik məlumatlar + Model"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik məlumatlar + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik məlumatlar + Parol"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biometrik məlumatlar olmadan davam edin"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Biometrik məlumatlarınızdan istifadə edərək telefonunuzu kiliddən çıxara bilərsiniz. Təhlükəsizlik üçün bu seçim ehtiyat ekran kilidi tələb edir."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Admin, siyasət və ya yaddaş deaktiv etdi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Heç biri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Silin"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Cihazın MAC ünvanı"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Təsadüfi MAC ünvanı"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ünvanı"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Şəbəkə bilgisi"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alt şəbəkə maskası"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Düzgün Şlüz ünvanı yazın."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Düzgün DNS ünvanı yazın."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 və 32 uzunluqlu şəbəkə prefiks daxil edin"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Şəxsi DNS tərəfindən ləğv edilmədiyi halda)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Şəxsi DNS tərəfindən ləğv edilmədiyi halda)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Keçid"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Şəbəkə prefiks uzunluğu"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Üz kilidi üçün parol ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Üz kilidindən üçün model ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Üz kilidi istifadə etmək üçün PIN ayarlayın"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometrik məlumatlardan istifadə üçün parol təyin edin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometrik məlumatlardan istifadə üçün model təyin edin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometrik məlumatlardan istifadə üçün PIN təyin edin"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Parolu unutmusunuz?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Modeli unutmusunuz?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN\'i unutmusunuz?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Quraşdırılmayıb - İş profili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nik"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> istifadəçiyə qədər əlavə edə bilərsiniz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Yalnız planşet sahibi istifadəçiləri idarə edə bilər."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Yalnız telefon sahibi istifadəçiləri idarə edə bilər"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Geri"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Növbəti"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Bitir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Foto çəkin"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Şəkil seçin"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto seçin"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartlar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartlar"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə parolunuzu tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Bəli"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Xeyr"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Məhdudlaşdırılmış"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ünvanına qoşulduqda əlçatan deyil"</string>
     <string name="see_more" msgid="7499355691042812723">"Ətraflı"</string>
     <string name="see_less" msgid="2642392725363552793">"Baxışı kiçildin"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktiv edilsin?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktiv edilsin?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM deaktiv edilir<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatoru deaktiv etmək mümkün deyil"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xəta baş verdi və operatoru deaktiv etmək mümkün olmadı."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Cihaza qoşulun"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> cihazınıza qoşulmaq üçün müvəqqəti Wi‑Fi şəbəkəsindən istifadə etmək istəyir"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Cihaz tapılmadı. Cihazların aktiv olması və qoşulmaq üçün əlçatan olmasından əmin olun."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index fb77252..69199d6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje ekrana"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Otključajte telefon bezbedno pomoću lica i otiska prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Moguće je i prijavljivanje u aplikacije i potvrđivanje plaćanja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Podesite otključavanje pomoću:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Pojednostavite otključavanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Uštedite na vremenu i otključajte telefon u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalje"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice je dodato"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Podesite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću otiska prsta. Više informacija zatražite od administratora organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
@@ -458,12 +448,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Želite li da preskočite podešavanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Želite li da preskočite podešavanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Želite li da preskočite podešavanje šablona?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Podesite rezervni metod za zaključavanje ekrana"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite rezervni način za zaključavanje ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje ekrana"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavite bez otključavanja licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete da otključate telefon pomoću lica. Ova opcija zahteva rezervni metod zaključavanja ekrana iz bezbednosnih razloga."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija + šablon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija + lozinka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavite bez biometrije"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Možete da otključate telefon pomoću biometrije. Ova opcija zahteva rezervni metod zaključavanja ekrana iz bezbednosnih razloga."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, smernice za šifrovanje ili skladište akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevucite"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumična MAC adresa"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalji o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Unesite važeću adresu mrežnog prolaza."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Unesite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Unesite prefiks mreže dužine između 0 i 32 znaka."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (osim ako ga ne zameni privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (osim ako ga ne zameni privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Mrežni prolaz"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dužina prefiksa mreže"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1835,19 +1819,16 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Otključavanje licem zahteva lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Otključavanje licem zahteva šablon"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Otključavanje licem zahteva PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Podesite lozinku za korišćenje biometrije"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Podesite šablon za korišćenje biometrije"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Podesite PIN za korišćenje biometrije"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste lozinku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste šablon?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Upotrebite šablon za uređaj da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Koristite šablon za uređaj da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Unesite PIN uređaja da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Unesite lozinku uređaja da biste nastavili"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Upotrebite šablon za poslovni profil da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Koristite šablon za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"Unesite PIN za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Unesite lozinku za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Radi veće bezbednosti koristite šablon za uređaj"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije podešeno – poslovni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Možete da dodate najviše <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tableta može da upravlja korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može da upravlja korisnicima."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazad"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalje"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Završi"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Slikajte"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Izaberite sliku"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos PIN-a pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos šablona pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinke pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos lozinke pri pokretanju uređaja?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos PIN-a pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva šablon pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos lozinke pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničeno"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je uspostavljena veza sa operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Prikaži još"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite li da isključite uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite li da isključite SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM se isključuje<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Onemogućavanje mobilnog operatera nije uspelo"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Došlo je do greške i onemogućavanje mobilnog operatera nije uspelo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povežite se sa uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi da koristi privremenu Wi‑Fi mrežu da bi se povezala sa uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj Proverite da li je uređaj uključen i dostupan za povezivanje."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 4164f24..35a43ae 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блакіроўка экрана, распазнаванне твару"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блакіроўка экрана, адбітак пальца"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блакіроўка экрана"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Разблакіруйце тэлефон з дапамогай твару і адбітка пальца"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Яшчэ вы можаце ўваходзіць у праграмы і пацвярджаць плацяжы"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Наладзіць разблакіроўку з дапамогай:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Распазнаванне твару"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Зрабіце разблакіроўку тэлефона простай"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Адбітак пальца"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Зэканомце час, разблакіруйце ў кішэні"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прапусціць"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далей"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Твар дададзены"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Наладзіць распазнаванне твару"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Распазнаванне твару"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасаваць"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, дзякуй"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далей"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прапусціць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далей"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Калі планшэт абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Калі прылада абаронена з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ёй у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Калі тэлефон абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Калі планшэт абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Калі прылада абаронена з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ёй у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Калі тэлефон абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Прапусціць наладку PIN-кода?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Прапусціць наладку пароля?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Прапусціць наладку ўзору разблакіроўкі?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Прадухіліце выкарыстанне гэтага планшэта без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Наладзьце дадатковы спосаб блакіроўкі экрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Параметры экрана блакіроўкі"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Параметры экрана блакіроўкі"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Блакіроўка экрана"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Распазнаванне твару + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Працягнуць без распазнавання твару"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання твару. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Біяметрыя + узор разблакіроўкі"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Біяметрыя + PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Біяметрыя + пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Працягнуць без біяметрыі"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання біяметрычных даных. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Адключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых даных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Правядзенне пальцам"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адрас прылады"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Выпадковы MAC-адрас"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адрас"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Інфармацыя аб сетцы"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска падсеткі"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Увядзіце сапраўдны адрас шлюза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Увядзіце сапраўдны адрас DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Увядзіце даўжыню сеткавага прэфікса ад 0 і 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (калі не перавызначана прыватным DNS-серверам)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (калі не перавызначана прыватным DNS-серверам)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Даўжыня прэфікса сеткі"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1468,7 +1452,7 @@
     <string name="memory_media_usage" msgid="5161308657995646963">"Медыя"</string>
     <string name="memory_downloads_usage" msgid="8252462247720191179">"Спампаваць"</string>
     <string name="memory_dcim_usage" msgid="3568913845973164352">"Выявы, відэа"</string>
-    <string name="memory_music_usage" msgid="8100634000114206429">"Аўдыё (музыка, рынгтоны, падкасты і г. д.)"</string>
+    <string name="memory_music_usage" msgid="8100634000114206429">"Аўдыя (музыка, рынгтоны, падкасты і г. д.)"</string>
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"Іншыя файлы"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"Кэшаваныя дадзеныя"</string>
     <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"Адключыць сумеснае сховішча"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Для распазнавання твару задайце пароль"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Для распазнавання твару наладзьце ўзор"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Для распазнавання твару задайце PIN-код"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Каб скарыстаць біяметрыю, задайце пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Каб скарыстаць біяметрыю, задайце ўзор"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Каб скарыстаць біяметрыю, задайце PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забылі пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забылі ўзор разблакіроўкі?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забылі PIN-код?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не наладжана – Рабочы профіль"</string>
     <string name="user_admin" msgid="4024553191395768119">"Адміністратар"</string>
     <string name="user_you" msgid="3070562015202859996">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псеўданім"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Вы можаце дадаць да <xliff:g id="USER_COUNT">%1$d</xliff:g> карыстальнікаў"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Толькі ўладальнік планшэта можа кіраваць карыстальнікамі."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Толькі ўладальнік тэлефона можа кіраваць карыстальнікамі."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далей"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Завершыць"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зрабіць фота"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Выбраць відарыс"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Выбраць фота"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карты"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карты"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"У дадатак да выкарыстання функцыі выяўлення твару для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"У дадатак да выкарыстання функцыі выяўлення твару для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор разблакіроўкі для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору разблакіроўкі перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць узор разблакіроўкі для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Так"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"З абмежаваннямі"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недаступна праз аператара \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string>
     <string name="see_more" msgid="7499355691042812723">"Яшчэ"</string>
     <string name="see_less" msgid="2642392725363552793">"Паказаць менш"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Адключыць аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Адключыць SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Адключаецца SIM-карта<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не ўдалося адключыць аператара"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешта пайшло не так. Не ўдалося адключыць вашага аператара."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Падключыць да прылады"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Праграма \"<xliff:g id="APPNAME">%1$s</xliff:g>\" запытвае дазвол на часовае выкарыстанне сеткі Wi‑Fi для падключэння да вашай прылады"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Прылады не знойдзены. Пераканайцеся, што прылады ўключаны і даступныя для падключэння."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fb03f80..5004a6c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заключване на екрана, отключване с лице"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Опция за заключване на екрана, отпечатък"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Опция за заключване на екрана"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Отключвайте телефона си надеждно чрез лицето и отпечатъка си"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Можете също да влизате в приложения и потвърждавате плащания"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Настройте отключване посредством:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Отключване с лице"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Улеснете отключването на телефона си"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отпечатък"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Отключвайте телефона си бързо и лесно"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропускане"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Напред"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Добавено е лице"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Настройване на отключването с лице"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Отключване с лице"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с отпечатъка си. За повече информация се свържете с администратора на организацията си."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отказ"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, благодаря"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропускане"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Напред"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Като защитите таблета си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Като защитите устройството си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубено или откраднато. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Като защитите телефона си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Като защитите таблета си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Като защитите устройството си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубено или откраднато. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Като защитите телефона си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Да се пропусне ли настройването на ПИН?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Да се пропусне ли настройването на парола?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Да се пропусне ли настройването на фигура?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Предотвратете използването на този таблет от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Настройте резервен начин за заключване на екрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Изберете резервния си начин на заключване на екрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опции за заключване на екрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опции за заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Заключване на екрана"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Отключване с лице + парола"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продължаване без отключване с лице"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Можете да отключвате телефона си посредством лицето си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрично удостоверяване + фигура"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрично удостоверяване + ПИН код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрично удостоверяване + парола"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продължаване без биометрично удостоверяване"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Можете да отключвате телефона си посредством биометричните си данни. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"С бързо плъзгане"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC адрес на устройството"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Рандомизиран MAC адрес"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP адрес"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Подробно за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Подмрежова маска"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Въведете валиден адрес за шлюз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Въведете валиден адрес за DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Въведете дължина на мреж. префикс между 0 и 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (освен ако не се замени с частен DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (освен ако не се замени с частен DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Дължина на мрежов префикс"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"За да отключвате с лице, задайте парола"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"За да отключвате с лице, задайте фигура"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"За да отключвате с лице, задайте ПИН"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Задайте парола като резервна опция"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Задайте фигура като резервна опция"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Задайте ПИН като резервна опция"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забравили сте паролата?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забравили сте фигурата?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забравили сте ПИН кода?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не е настроен – Служебен потребителски профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вие (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдоним"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можете да добавите до <xliff:g id="USER_COUNT">%1$d</xliff:g> потребители"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само собственикът на таблета може да управлява потребителите."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само собственикът на телефона може да управлява потребителите."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Напред"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Край"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Правене на снимка"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Избиране на изображение"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Избиране на снимка"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карти"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карти"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането ѝ няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането ѝ няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Не е налице, когато е установена връзка с(ъс) <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Вижте още"</string>
     <string name="see_less" msgid="2642392725363552793">"Преглед на по-малко"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се изключи ли <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се изключи ли SIM картата?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картата се изключва<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Операторът не може да бъде деактивиран"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нещо се обърка и операторът ви не бе деактивиран."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Свързване с устройство"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Приложението <xliff:g id="APPNAME">%1$s</xliff:g> иска да използва временна Wi-Fi мрежа, за да се свърже с устройството ви"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Няма намерени устройства. Уверете се, че устройствата са включени и налице за свързване."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index b0fcfff..cbf4855 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্রিন লক, মুখের সাহায্যে আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্রিন লক, আঙ্গুলের ছাপ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"স্ক্রিন লক"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"আপনার মুখ এবং আঙ্গুলের ছাপের সাহায্যে নিরাপদে ফোন আনলক করুন"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"এছাড়া আপনি অ্যাপে সাইন-ইন করে পেমেন্ট কনফার্ম করতে পারেন"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"এর সাথে আনলক সেট আপ করুন:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"মুখের সাহায্যে আনলক করার ফিচার"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"আপনার ফোন আনলক করার বিষয়টি সহজ করে তুলুন"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"আঙ্গুলের ছাপ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"পকেটে ফোন আনলক করে সময় সাশ্রয় করুন"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"এড়িয়ে যান"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"পরবর্তী"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ফেস যোগ করা হয়েছে"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"মুখের সাহায্যে আনলক করার ফিচার সেট-আপ করুন"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"মুখের সাহায্যে আনলক"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপনার ফোন আনলক বা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।\n\nদ্রষ্টব্য: একটি দৃঢ় বা সুরক্ষিত প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম সুরক্ষিত হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল করুন"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"না থাক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চালিয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এড়িয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পরবর্তী"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ট্যাবলেটের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ডিভাইসের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ফোনের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ট্যাবলেটের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ডিভাইসের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ফোনের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"পিন সেট-আপ করার পদ্ধতি এড়াতে চান?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"পাসওয়ার্ড সেট-আপ করার ধাপটি এড়াতে চান?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"প্যাটার্ন সেট-আপ করার ধাপ এড়াতে চান?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"আপনার ব্যাক আপ স্ক্রিন লক করার পদ্ধতি সেট-আপ করুন"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"আপনার ব্যাক-আপ স্ক্রিন লক পদ্ধতি বেছে নিন"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"স্ক্রিন লক-এর বিকল্প"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"স্ক্রিন লক-এর বিকল্পগুলি"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"স্ক্রিন লক"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"মুখের সাহায্যে আনলক + পাসওয়ার্ড"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"মুখের সাহায্যে আনলক সেট-আপ না করা"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"আপনার ফেস ব্যবহার করে আপনি ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"বায়োমেট্রিক্স + প্যাটার্ন"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"বায়োমেট্রিক্স + পিন"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"বায়োমেট্রিক্স + পাসওয়ার্ড"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"বায়োমেট্রিক্স ছাড়াই চালিয়ে যান"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"বায়োমেট্রিক্স ব্যবহার করে আপনার নিজের ফোন আনলক করতে পারেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল স্টোরেজ দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"কোনও কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"সোয়াইপ করুন"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ডিভাইস MAC অ্যাড্রেস"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"র‌্যান্ডামাইজ করা MAC অ্যাড্রেস"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"আইপি অ্যাড্রেস"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"নেটওয়ার্কের বিবরণ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"সাবনেট মাস্ক"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"একটি বৈধ গেটওয়ে ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"একটি বৈধ DNS ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"০ এবং ৩২ এর মধ্যে একটি নেটওয়ার্ক প্রিফিক্স দৈর্ঘ্য টাইপ করুন।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ডিএনএস ১ (যদি ব্যক্তিগত ডিএনএস-এ পরিবর্তন না করা হয়)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ডিএনএস ২ (যদি ব্যক্তিগত ডিএনএস-এ পরিবর্তন না করা হয়)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"গেটওয়ে"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"নেটওয়ার্ক প্রিফিক্স দৈর্ঘ্য"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ওয়াই-ফাই ডাইরেক্ট"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"মুখের সাহায্যে আনলক করতে পাসওয়ার্ড সেট"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"মুখের সাহায্যে আনলক করতে প্যাটার্ন সেট"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"মুখের সাহায্যে আনলক করতে পিন সেট করা"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"বায়োমেট্রিক্স ব্যবহার করতে পাসওয়ার্ড সেট করুন"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"বায়োমেট্রিক্স ব্যবহার করতে প্যাটার্ন সেট করুন"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"বায়োমেট্রিক্স ব্যবহার করতে পিন সেট করুন"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"পাসওয়ার্ড ভুলে গেছেন?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"প্যাটার্ন ভুলে গেছেন?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"পিন ভুলে গেছেন?"</string>
@@ -1991,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"আপনি এই অ্যাপ বন্ধ করে দিলে, Android এবং অন্যান্য অ্যাপ যেভাবে কাজ করার কথা সেইভাবে আর নাও কাজ করতে পারে। মনে রাখবেন যে এই অ্যাপ আপনার ডিভাইসে আগে থেকেই ইনস্টল করা আছে বলে এটি আপনি মুছে ফেলতে পারবেন না। বন্ধ করার মাধ্যমে, আপনি অ্যাপটিকে বন্ধ করে লুকিয়ে রাখতে পারেন।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"স্টোর"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"অ্যাপের বিশদ বিবরণ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"সেট-আপ করা নেই - কর্মস্থলের প্রোফাইল"</string>
     <string name="user_admin" msgid="4024553191395768119">"প্রশাসক"</string>
     <string name="user_you" msgid="3070562015202859996">"আপনি (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ডাকনাম"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"আপনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন পর্যন্ত ব্যবহারকারী যোগ করতে পারেন"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"শুধুমাত্র ট্যাবলেটেরর মালিক ব্যবহারকারীদের পরিচালনা করতে পারেন।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"শুধুমাত্র ফোনের মালিক ব্যবহারকারীদের পরিচালনা করতে পারেন।"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ফিরুন"</string>
     <string name="wizard_next" msgid="3884832431439072471">"পরবর্তী"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"শেষ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ফটো তুলুন"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"একটি ছবি বেছে নিন"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ফটো বেছে নিন"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"সিম কার্ডগুলি"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"সিম কার্ডগুলি"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"আপনার ডিভাইস আনলক করার জন্য আপনার ফেস ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পিন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় পিন দেওয়ার ব্যবস্থা রাখতে চান?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"আপনার ডিভাইস আনলক করার জন্য আপনার ফেস ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার প্যাটার্ন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় প্যাটার্ন দেওয়ার ব্যবস্থা রাখতে চান?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"আপনার ডিভাইস আনলক করার জন্য ফেস ব্যবহার করা ছাড়াও, ডিভাইসটি চালু হওয়ার সময় পাসওয়ার্ড দেওয়ার মাধ্যমে আপনি এটিকে আরও সুরক্ষিত রাখতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত এতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় পাসওয়ার্ড দেওয়ার ব্যবস্থা রাখতে চান?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার পিন চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। পিন দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার প্যাটার্ন চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। প্যাটার্ন দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার পাসওয়ার্ড চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। পাসওয়ার্ড দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"হ্যাঁ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"না"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"সীমাবদ্ধ"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-এ কনেক্ট থাকলে উপলভ্য থাকে না"</string>
     <string name="see_more" msgid="7499355691042812723">"আরও দেখুন"</string>
     <string name="see_less" msgid="2642392725363552793">"কম দেখুন"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> পরিষেবা বন্ধ করতে চান?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"সিম বন্ধ করতে চান?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"সিম বন্ধ করা হচ্ছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"পরিষেবা প্রদানকারীকে বন্ধ করা যাবে না"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কোনও সমস্যা হয়েছে এবং আপনার পরিষেবা প্রদানকারীর পরিষেবা বন্ধ করা যায়নি।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ডিভাইসে কানেক্ট করুন"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"আপনার ডিভাইসে কানেক্ট করার জন্য <xliff:g id="APPNAME">%1$s</xliff:g> অ্যাপ সাময়িকভাবে একটি ওয়াই-ফাই নেটওয়ার্ক ব্যবহার করতে চায়"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"কোনও ডিভাইস খুঁজে পাওয়া যায়নি। ডিভাইস চালু আছে এবং কানেক্ট করার জন্য তৈরি কিনা তা ভাল করে দেখে নিন।"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b049e3f..6afb014 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje ekrana"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sigurno otključajte telefon licem i otiskom prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Možete se prijaviti i u aplikacije i potvrditi plaćanje"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Postavite otključavanje koristeći:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Pojednostavite otključavanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Otključajte telefon dok vam je u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Naprijed"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice je dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Postavite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprijed"</string>
@@ -430,9 +420,9 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1570832293693405757">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4618501606519351904">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2412426429887900241">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3365990364131398523">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3365990364131398523">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili ga neko ukrade."</string>
     <string name="skip_anyway_button_label" msgid="3442274117023270068">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="6139455414099035594">"Nazad"</string>
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
@@ -452,18 +442,15 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradit ću to kasnije"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Odabrali ste da koristite otisak prsta kao jedan od načina za otključavanja telefona. Ukoliko sada preskočite ovaj korak, morat ćete ga postaviti kasnije. Postavka traje otprilike samo jednu minutu."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Zaštitite tablet zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Zaštitite uređaj zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Zaštitite telefon zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i da postavite otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Zaštitite tablet zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Zaštitite uređaj zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Zaštitite telefon zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i da postavite otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Postavite rezervnu metodu zaključavanja ekrana"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite rezervni način zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje ekrana"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavite s otključavanjem licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija + uzorak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija + lozinka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavite bez biometrije"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon možete otključati pomoću biometrije. Iz sigurnosnih razloga, ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevlačenje prstom"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumično odabrana MAC adresa"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalji o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Unesite važeću adresu pristupnika."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Unesite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Unesite dužinu mrežnog prefiksa između 0 i 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (osim ako ga nije poništio privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (osim ako ga nije poništio privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dužina prefiksa mreže"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WiFi Direct"</string>
@@ -1835,12 +1819,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Za otključavanje licem postavite lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Za otključavanje licem, postavite uzorak"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Za otključavanje licem, postavite PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Da koristite biometriju, postavite lozinku"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Da koristite biometriju, postavite uzorak"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Da koristite biometriju, postavite PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste lozinku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste uzorak?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije postavljen – Radni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Možete dodati do <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tableta može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može upravljati korisnicima."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazad"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Naprijed"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Kraj"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Snimite fotografiju"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Odaberite fotografiju"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos PIN-a prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati PIN za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos uzorka prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati uzorak za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos lozinke prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati lozinku za pokretanje uređaja?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja PIN-a prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva PIN?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva uzorak?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja lozinke prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva lozinka?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničena"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pogledajte više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nismo mogli onemogućiti operatera"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto nije uredu i nismo mogli onemogućiti vašeg operatera."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povezivanje s uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi koristiti privremenu WiFi mrežu da se poveže s vašim uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj Provjerite jesu li uređaji uključeni i dostupni za povezivanje."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 46df256..bc0c121 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueig de pantalla, desbloqueig facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueig de pantalla, empremta digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueig de pantalla"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueja el telèfon amb la cara i l\'empremta digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"També pots iniciar la sessió en apps i confirmar el pagament"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueig amb:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueig facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloqueja el telèfon fàcilment"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empremta digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueja el telèfon des de la butxaca"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omet"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Següent"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Cara afegida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura el desbloqueig facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueig facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: no pots fer servir l\'empremta digital per desbloquejar aquest dispositiu. Per obtenir més informació, contacta amb l\'administrador de la teva organització."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: és possible que l\'empremta digital sigui menys segura que un bon patró o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel·la"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gràcies"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omet"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Següent"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si protegeixes la tauleta amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-la si la perds o te la roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si protegeixes el dispositiu amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si protegeixes el telèfon amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si protegeixes la tauleta amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-la si la perds o te la roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si protegeixes el dispositiu amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si protegeixes el telèfon amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"No vols configurar el PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"No vols configurar la contrasenya?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"No vols configurar el patró?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configura un mètode de bloqueig de pantalla alternatiu"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcions de bloqueig de pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcions de bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueig de pantalla"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueig facial + contrasenya"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continua sense el desbloqueig facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Pots desbloquejar el telèfon amb l\'autenticació facial. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + patró"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + contrasenya"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continua sense biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Pots desbloquejar el telèfon amb la biometria. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desact. per l\'admin., política d\'encrip. o emmagat. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Llisca"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adreça MAC del dispositiu"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adreça MAC aleatòria"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adreça IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalls de la xarxa"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Màscara de la subxarxa"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escriu una adreça de passarel·la vàlida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escriu una adreça DNS vàlida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escriu una longitud de prefix de xarxa entre 0 i 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tret que se substitueixi per un DNS privat)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tret que se substitueixi per un DNS privat)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passarel·la"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud de prefix de xarxa"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Per al desbloqueig facial, cal una contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Per al desbloqueig facial, cal un patró"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Per al desbloqueig facial, cal un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Per a la biometria, cal una contrasenya"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Per a la biometria, cal un patró"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Per a la biometria, cal un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Has oblidat la contrasenya?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Has oblidat el patró?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Has oblidat el PIN?"</string>
@@ -2150,7 +2131,7 @@
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"Marques de funcions"</string>
     <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
-    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinat principalment a persones invidents i amb problemes de visió"</string>
+    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinat principalment a persones invidents i amb poca visió"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca els elements de la pantalla per sentir-los en veu alta"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferències dels subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliació"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"El perfil de treball no està configurat."</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Àlies"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Pots afegir fins a <xliff:g id="USER_COUNT">%1$d</xliff:g> usuaris"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Només el propietari de la tauleta pot gestionar els usuaris."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Només el propietari del telèfon pot gestionar els usuaris."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Enrere"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Següent"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalitza"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fes una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Tria una imatge"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecciona una foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Targetes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Targetes SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un PIN per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un patró per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti una contrasenya per iniciar el dispositiu?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti un PIN abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un PIN per iniciar el dispositiu?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti un patró abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un patró per iniciar el dispositiu?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti una contrasenya per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No està disponible quan està connectat a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Mostra\'n més"</string>
     <string name="see_less" msgid="2642392725363552793">"Mostra\'n menys"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vols desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vols desactivar la SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"S\'està desactivant la SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No es pot desactivar l\'operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"S\'ha produït un error i no s\'ha pogut desactivar l\'operador."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connexió al dispositiu"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'aplicació <xliff:g id="APPNAME">%1$s</xliff:g> vol fer servir una xarxa Wi‑Fi temporal per connectar-se al teu dispositiu"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No s\'ha trobat cap dispositiu. Comprova que els dispositius estiguin activats i disponibles per connectar-s\'hi."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index de64129..72842da 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámek obrazovky, odemknutí obličejem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámek obrazovky, otisky prstů"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zámek obrazovky"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Odemykejte telefon bezpečně svým obličejem a otiskem prstu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Můžete se také přihlašovat do aplikací a potvrzovat platby"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastavit odemykání pomocí:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odemknutí obličejem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Usnadněte si odemykání telefonu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisk prstu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ušetřete čas odemykáním telefonu v kapse"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Přeskočit"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Další"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Obličej přidán"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastavit odemknutí obličejem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odemknutí obličejem"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušit"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, díky"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Přeskočit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Další"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Pokud svůj tablet ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Pokud své zařízení ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Pokud svůj telefon ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Pokud svůj tablet ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Pokud své zařízení ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Pokud svůj telefon ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Přeskočit nastavení kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Přeskočit nastavení hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Přeskočit nastavení gesta?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Nastavte záložní metodu zámku obrazovky."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zvolte záložní metodu zámku obrazovky"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zámku obrazovky"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zámku obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zámek obrazovky"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odemknutí obličejem + heslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Pokračovat bez odemknutí obličejem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Zařízení můžete odemknout pomocí obličeje. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrie + gesto"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrie + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrie + heslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Pokračovat bez biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon můžete odemknout pomocí biometrie. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázáno administrátorem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Žádná"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Přejetí prstem"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC zařízení"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Náhodná adresa MAC"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podrobnosti sítě"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsítě"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Zadejte prosím platnou adresu brány."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Zadejte prosím platnou adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Zadejte prosím délku síťové předpony v rozsahu 0 až 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"Server DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"Server DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (pokud není přepsán soukromým DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (pokud není přepsán soukromým DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Délka síťové předpony"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Nastavte heslo pro odemknutí obličejem"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Nastavte gesto pro odemknutí obličejem"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Nastavte PIN pro odemknutí obličejem"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Před aktivací biometrie nastavte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Před aktivací biometrie nastavte gesto"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Před aktivací biometrie nastavte PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zapomněli jste heslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zapomněli jste gesto?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zapomněli jste PIN?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nenastaveno – pracovní profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrátor"</string>
     <string name="user_you" msgid="3070562015202859996">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Přezdívka"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Maximální počet přidávaných uživatelů: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Uživatele smí spravovat pouze vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Uživatele smí spravovat pouze vlastník telefonu."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Zpět"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Další"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončit"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Vyfotit"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Zvolit obrázek"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vybrat fotografii"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM karty"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM karty"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ano"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Omezené"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Při připojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g> nedostupné"</string>
     <string name="see_more" msgid="7499355691042812723">"Zobrazit další"</string>
     <string name="see_less" msgid="2642392725363552793">"Zobrazit méně"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vypnout operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vypnout SIM kartu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypínání SIM karty<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operátora nelze deaktivovat"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Něco se pokazilo a deaktivace operátora se nezdařila."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Připojení k zařízení"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikace <xliff:g id="APPNAME">%1$s</xliff:g> chce za účelem připojení k zařízení použít dočasnou síť Wi-Fi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nebyla nalezena žádná zařízení. Zajistěte, aby zařízení byla zapnutá a dostupná k připojení."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d2ff9ca..3cf2232 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skærmlås, Ansigtslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skærmlås, fingeraftryk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skærmlås"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Lås din telefon op på sikker vis med ansigt og fingeraftryk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Du kan også logge ind på apps og bekræfte betalinger"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfigurer oplåsning med:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ansigtslås"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Gør det nemt at låse telefonen op"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingeraftryk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Lås telefonen op i lommen, og spar tid"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Spring over"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Næste"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ansigt tilføjet"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfigurer ansigtslås"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ansigtslås"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Du kan ikke bruge dit fingeraftryk til at låse op for denne enhed. Få flere oplysninger ved at kontakte administratoren for din organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en pinkode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuller"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tak"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsæt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Spring over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Næste"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Når du beskytter din tablet med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Når du beskytter din enhed med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Når du beskytter din telefon med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Når du beskytter din tablet med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Når du beskytter din enhed med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Når du beskytter din telefon med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vil du springe pinkodekonfiguration over?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vil du springe adgangskodekonfiguration over?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vil du springe mønsterkonfiguration over?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Konfigurer din alternative metode til skærmlåsning"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Vælg din alternative metode til skærmlåsning"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Valgmuligheder for skærmlås"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Valgmuligheder for skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skærmlås"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ansigtslås + adgangskode"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Fortsæt uden ansigtslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse din telefonen op ved hjælp af dit ansigt. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriske systemer + mønster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriske systemer + pinkode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriske systemer + adgangskode"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Fortsæt uden biometriske systemer"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kan låse telefonen op ved hjælp af biometriske systemer. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Deaktiveret af administrator, krypteringspolitik eller Lager for loginoplysninger"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Stryg"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhedens MAC-adresse"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tilfældig MAC-adresse"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netværksoplysninger"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Undernetmaske"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Angiv en gyldig gatewayadresse."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Angiv en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Angiv gyldigt netværkspræfiks på 0-32 tegn."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (undtagen ved tilsidesættelse med privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (undtagen ved tilsidesættelse med privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Længde på netværkspræfiks"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Angiv sikkerhedskopi for ansigtslås"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Angiv mønster for at bruge ansigtslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Angiv pinkode for at bruge ansigtslås"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Angiv adgangskode for at bruge biometriske systemer"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Angiv mønster for at bruge biometriske systemer"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Angiv pinkode for at bruge biometriske systemer"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glemt din adgangskode?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glemt dit mønster?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glemt din pinkode?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ikke konfigureret – Arbejdsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Dig (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Kaldenavn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan tilføje op til <xliff:g id="USER_COUNT">%1$d</xliff:g> brugere"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Kun ejeren af tabletten kan administrere brugere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Kun ejeren af telefonen kan administrere brugere."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tilbage"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Næste"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Udfør"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tag et billede"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vælg et billede"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vælg billede"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nej"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begrænset"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Se mere"</string>
     <string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du deaktivere <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du deaktivere SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Deaktiverer SIM-kort<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilselskabet kan ikke deaktiveres"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noget gik galt, og dit mobilselskab kunne ikke deaktiveres."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Opret forbindelse til enheden"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil gerne have midlertidig adgang til dit Wi-Fi-netværk for at oprette forbindelse til din enhed"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Der blev ikke fundet nogen enheder. Sørg for, at enhederne er tændt, og at der kan oprettes forbindelse til dem."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7549fac..b2e00aa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Displaysperre, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Displaysperre und Fingerabdruck"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Displaysperre"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Smartphone mit deinem Gesicht oder Fingerabdruck sicher entsperren"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Du kannst dich damit auch bei Apps anmelden und Zahlungen bestätigen"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Entsperren einrichten mit:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Smartphone ganz einfach entsperren"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerabdruck"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Smartphone in der Tasche schneller entsperren"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Überspringen"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Weiter"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gesicht hinzugefügt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Face Unlock einrichten"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dieses Gerät kann nicht mit deinem Fingerabdruck entsperrt werden. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Abbrechen"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nein danke"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Überspringen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Weiter"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Mit der Displaysperre kannst du dein Tablet schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Mit der Displaysperre kannst du dein Gerät schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Mit der Displaysperre kannst du dein Smartphone schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Mit einer Displaysperre kannst du dein Tablet schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Mit einer Displaysperre kannst du dein Gerät schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Mit einer Displaysperre kannst du dein Smartphone schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN-Einrichtung überspringen?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Passworteinrichtung überspringen?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Mustereinrichtung überspringen?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Richte deine alternative Methode für die Displaysperre ein."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Alternative Methode für die Displaysperre auswählen"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Optionen für die Displaysperre"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Optionen für die Displaysperre"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Displaysperre"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + Passwort"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Ohne Face Unlock fortfahren"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kannst dein Smartphone über die Gesichtserkennung entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrisches Verfahren + Muster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrisches Verfahren + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrisches Verfahren + Passwort"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Ohne biometrisches Verfahren fortfahren"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kannst dein Smartphone mit deinem biometrischen Verfahren entsperren. Aus Sicherheitsgründen ist bei dieser Option eine alternative Displaysperre erforderlich."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Durch Administrator, Richtlinie oder Anmeldedatenspeicher deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Wischen"</string>
@@ -1032,6 +1014,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-Adresse des Geräts"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Zufällige MAC-Adresse"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-Adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netzwerkdetails"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetzmaske"</string>
@@ -1049,8 +1033,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Gib eine gültige Gateway-Adresse ein."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Gib eine gültige DNS-Adresse ein."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Netzwerkpräfix darf maximal 32 Zeichen enthalten."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sofern nicht von privatem DNS überschrieben)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sofern nicht von privatem DNS überschrieben)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Länge d. Netzwerkpräfixes"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1814,12 +1798,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Für Face Unlock Passwort festlegen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Für Face Unlock Muster festlegen"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Für Face Unlock PIN festlegen"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Passwort festlegen"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Muster festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"PIN festlegen"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Passwort vergessen?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Muster vergessen?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN vergessen?"</string>
@@ -2458,9 +2439,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Akkulaufzeit des Tablets verbessern"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Akkulaufzeit des Geräts verbessern"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Funktion \"Akku-Manager\" aktivieren"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Energiesparmodus aktivieren"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Stromsparmodus aktivieren"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Der Akku könnte früher als üblich leer sein"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Energiesparmodus ist aktiviert"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Stromsparmodus ist aktiviert"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Einige Funktionen sind eventuell eingeschränkt"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Smartphone mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet mehr als üblich genutzt"</string>
@@ -2498,9 +2479,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Diese App kann dann im Hintergrund laufen 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="7940183167721998470">"Entfernen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Abbrechen"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"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="573297655597451123">"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="8222461068860745749">"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="default" msgid="6097167058237891756">"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 Stromsparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"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 Stromsparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"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 Stromsparmodus aktivieren."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Akku-Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Apps automatisch verwalten"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Akkunutzung für selten verwendete Apps einschränken"</string>
@@ -2593,7 +2574,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Mit einem anderen Bluetooth-Gerät verbinden"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Akkuverbrauch durch App"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"App anhalten oder deinstallieren"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Energiesparmodus auswählen"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Stromsparmodus auswählen"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Akkuverbrauch durch Nutzer"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Sonstiger Akkuverbrauch"</string>
@@ -2624,23 +2605,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Aktualisieren"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"App-Optimierung"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Energiesparmodus"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Stromsparmodus"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Automatisch aktivieren"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Keine Aktivierung nach Zeitplan"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Anhand meiner üblichen Abläufe"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Anhand des Ladestands"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Der Energiesparmodus wird automatisch aktiviert, wenn der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines üblichen Aufladezeitpunkts)."</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Der Stromsparmodus wird automatisch aktiviert, wenn 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="6190884450723824287">"Wird bei <xliff:g id="PERCENT">%1$s</xliff:g> aktiviert"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Zeitplan festlegen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akkulaufzeit verlängern"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Bei vollem Akku ausschalten"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Der Energiesparmodus wird deaktiviert, wenn dein Smartphone-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Der Energiesparmodus wird deaktiviert, wenn dein Tablet-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Der Stromsparmodus wird deaktiviert, wenn dein Smartphone-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Der Stromsparmodus wird deaktiviert, wenn dein Tablet-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Der Stromsparmodus wird deaktiviert, wenn dein Geräteakku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivieren"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Energiesparmodus aktivieren"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Stromsparmodus aktivieren"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Automatisch aktivieren"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Nie"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"bei <xliff:g id="PERCENT">%1$s</xliff:g> Akku"</string>
@@ -3052,7 +3033,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nicht eingerichtet – Arbeitsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ich (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Spitzname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kannst bis zu <xliff:g id="USER_COUNT">%1$d</xliff:g> Nutzer hinzufügen."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Nur der Eigentümer des Tablets kann Nutzer verwalten."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Nur der Eigentümer des Telefons kann Nutzer verwalten."</string>
@@ -3172,9 +3152,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Zurück"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Weiter"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fertig"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Foto aufnehmen"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Bild auswählen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto auswählen"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-Karten"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-Karten"</string>
@@ -3325,7 +3302,7 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"haptik, vibrieren, display, empfindlichkeit"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"Haptik, vibrieren, Smartphone, Anruf, Empfindlichkeit, klingeln"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"Haptik, vibrieren, Empfindlichkeit"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"Energiesparmodus, fixiert, nichtflüchtig, Stromsparfunktion, Akku"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"Stromsparmodus, fixiert, nichtflüchtig, Stromsparfunktion, Akku"</string>
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ablauf, zeitplan, energiesparmodus, stromsparfunktion, akku, automatisch, prozent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, erweiterte Anruffunktionen, 4G-Anrufe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Sprache hinzufügen, eine Sprache hinzufügen"</string>
@@ -3910,12 +3887,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Neben Face Unlock zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Neben Face Unlock zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Muster vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Muster zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Neben der Verwendung von Face Unlock zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deines Passworts erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten. Möchtest du festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Neben der Verwendung von biometrischen Verfahren zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart deine PIN eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts deine PIN eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Neben der Verwendung von biometrischen Verfahren zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart dein Entsperrungsmuster eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts dein Entsperrmuster eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Neben der Verwendung von biometrischen Verfahren zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart dein Passwort eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts dein Passwort eingegeben werden muss?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"\"Ja\""</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nein"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Eingeschränkt"</string>
@@ -4242,7 +4216,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"\"Bitte nicht stören\" aktiviert"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Smartphone stummgeschaltet"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"Mit Ausnahmen"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"Energiesparmodus aktiviert"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"Stromsparmodus aktiviert"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Funktionen eingeschränkt"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"Mobile Daten sind deaktiviert"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"Internet nur über WLAN verfügbar"</string>
@@ -4419,8 +4393,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demomodus der System-UI"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dunkles Design"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"An / Wegen Energiesparmodus vorübergehend deaktiviert"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Wegen Energiesparmodus vorübergehend aktiviert"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"An / Wegen Stromsparmodus vorübergehend deaktiviert"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Wegen Stromsparmodus vorübergehend aktiviert"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Unterstützte Apps wechseln ebenfalls zum dunklen Design"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ok"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Dunkles Design testen"</string>
@@ -4858,6 +4832,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
     <string name="see_more" msgid="7499355691042812723">"Mehr anzeigen"</string>
     <string name="see_less" msgid="2642392725363552793">"Weniger anzeigen"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktivieren?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktivieren?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM wird deaktiviert<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilfunkanbieter kann nicht deaktiviert werden"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ein Problem ist aufgetreten. Dein Mobilfunkanbieter konnte nicht deaktiviert werden."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Mit Gerät verbinden"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Die App \"<xliff:g id="APPNAME">%1$s</xliff:g>\" möchte sich über ein temporäres WLAN mit deinem Gerät verbinden"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Keine Geräte gefunden. Achte darauf, dass die Geräte eingeschaltet und zur Verbindung bereit sind."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4d33fdb..7c63017 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Κλείδωμα οθόνης, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Κλείδωμα οθόνης, δακτυλικό αποτύπωμα"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Κλείδωμα οθόνης"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ξεκλείδωμα τηλεφώνου με το πρόσωπο ή το δακτυλικό αποτύπωμα"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Συνδεθείτε επίσης σε εφαρμογές και επιβεβαιώστε πληρωμές."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ρύθμιση ξεκλειδώματος με:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Απλοποιήστε το ξεκλείδωμα του τηλεφώνου."</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Δακτυλικό αποτύπωμα"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ξεκλειδώστε το τηλέφωνο στην τσέπη σας."</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Παράβλεψη"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Επόμενο"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Προστέθηκε πρόσωπο"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ρύθμιση του Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ξεκλείδωμα του τηλεφώνου ή για έγκριση αγορών.\n\nΣημείωση: Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ακύρωση"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Όχι, ευχαριστώ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Παράβλεψη"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Επόμενο"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Προστατεύοντας το tablet με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Προστατεύοντας τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Προστατεύοντας το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Προστατεύοντας το tablet σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Προστατεύοντας τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Προστατεύοντας το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Παράβλεψη ρύθμισης PIN;"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Παράβλεψη ρύθμισης κωδικού πρόσβασης;"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Παράβλεψη ρύθμισης μοτίβου;"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ρύθμιση εφεδρικής μεθόδου κλειδώματος οθόνης"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Επιλογή μεθόδου εφεδρικού κλειδώματος οθόνης"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Επιλογές κλειδώματος οθόνης"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Επιλογές κλειδώματος οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Κλείδωμα οθόνης"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + κωδικός πρόσβασης"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Συνέχεια χωρίς το Face Unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπό σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Βιομετρικά + Μοτίβο"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Βιομετρικά + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Βιομετρικά + Κωδικός πρόσβασης"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Συνέχεια χωρίς βιομετρικά"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας τα βιομετρικά σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Ολίσθηση"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Διεύθυνση MAC συσκευής"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Τυχαία διεύθυνση MAC"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Διεύθυνση IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Λεπτομέρειες δικτύου"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Μάσκα υποδικτύου"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Πληκτρολογήστε μια έγκυρη διεύθυνση πύλης."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Πληκτρολογήστε μια έγκυρη διεύθυνση DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Εισαγάγετε το μήκος προθέματος δικτύου από 0 έως 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (εκτός αν παρακάμπτεται από Ιδιωτικό DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (εκτός αν παρακάμπτεται από Ιδιωτικό DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Πύλη"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Μήκος προθέματος δικτύου"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ρυθμ. κωδ. πρ. για χρήση του Face Unlock"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ρυθμ. μοτίβο για χρήση του Face Unlock"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Για να χρησιμοποιήσετε το Face Unlock, ορίστε ένα PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ορισμός κωδικού πρόσβασης για χρήση βιομετρικών"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ορισμός μοτίβου για χρήση βιομετρικών"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ορισμός PIN για χρήση βιομετρικών"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ξεχάσατε τον κωδικό πρόσβασής σας;"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ξεχάσατε το μοτίβο σας;"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ξεχάσατε το PIN σας;"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Δεν έχει ρυθμιστεί - Προφίλ εργασίας"</string>
     <string name="user_admin" msgid="4024553191395768119">"Διαχειριστής"</string>
     <string name="user_you" msgid="3070562015202859996">"Εσείς (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Ψευδώνυμο"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Μπορείτε να προσθέσετε έως και <xliff:g id="USER_COUNT">%1$d</xliff:g> χρήστες"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Μόνο ο κάτοχος του tablet μπορεί να διαχειριστεί χρήστες."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Μόνο ο κάτοχος του τηλεφώνου μπορεί να διαχειριστεί χρήστες."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Πίσω"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Επόμενο"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Τέλος"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Λήψη φωτογραφίας"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Επιλέξτε μια εικόνα"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Επιλογή φωτογραφίας"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Κάρτες SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Κάρτες SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας τον αριθμό PIN πριν από την εκκίνηση της συσκευής. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτό συμβάλλει στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται αριθμός PIN για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του μοτίβου σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό συμβάλλει στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται μοτίβο για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή με έναν κωδικό πρόσβασης ο οποίος θα ζητείται πριν από την εκκίνησή της. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ενέργεια συμβάλλει στην προστασία των δεδομένων των συσκευών σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται ο κωδικός πρόσβασης κατά την εκκίνηση της συσκευής;"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του PIN σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται το PIN κατά την εκκίνηση της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του μοτίβου σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται το μοτίβο κατά την εκκίνηση της συσκευής;"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του κωδικού πρόσβασής σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται ο κωδικός πρόσβασης κατά την εκκίνηση της συσκευής;"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ναι"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Όχι"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Περιορισμ. πρόσβασης"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Δεν διατίθεται κατά τη σύνδεση σε <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Δείτε περισσότερα"</string>
     <string name="see_less" msgid="2642392725363552793">"Εμφάνιση λιγότερων"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Απενεργοποίηση <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Απενεργοποίηση SIM;"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Απενεργοποίηση SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Δεν είναι δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Παρουσιάστηκε κάποιο πρόβλημα και δεν ήταν δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας σας."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Σύνδεση με τη συσκευή"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Η εφαρμογή <xliff:g id="APPNAME">%1$s</xliff:g> θέλει να χρησιμοποιήσει ένα προσωρινό δίκτυο Wi‑Fi για να συνδεθεί στη συσκευή σας."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Δεν βρέθηκαν συσκευές. Βεβαιωθείτε ότι οι συσκευές είναι ενεργοποιημένες και διαθέσιμες για σύνδεση."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1fe807d..6ba2c2f 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index d34fd5a..5d26000 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -237,7 +237,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"Airplane mode"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Wireless &amp; networks"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Manage Wi‑Fi, Bluetooth, Airplane mode, mobile networks and VPNs"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3055365654530847985">"Roaming"</string>
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1739,8 +1741,8 @@
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Let apps use GPS on your tablet to pinpoint your location"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"Let apps use GPS on your phone to pinpoint your location"</string>
     <string name="assisted_gps" msgid="1714546606018821498">"Use assisted GPS"</string>
-    <string name="assisted_gps_enabled" msgid="6220188450779319248">"Use server to assist GPS (un-tick to reduce network usage)"</string>
-    <string name="assisted_gps_disabled" msgid="1062496503892849">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
+    <string name="assisted_gps_enabled" msgid="6220188450779319248">"Use server to assist GPS (uncheck to reduce network usage)"</string>
+    <string name="assisted_gps_disabled" msgid="1062496503892849">"Use server to assist GPS (uncheck to improve GPS performance)"</string>
     <string name="use_location_title" msgid="1345594777162897654">"Location &amp; Google search"</string>
     <string name="use_location_summary" msgid="377322574549729921">"Let Google use your location to improve search results and other services"</string>
     <string name="location_access_title" msgid="4052667453826272040">"Access to my location"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 153f0d0..5efae9a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 311af7c..6236fa6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Can\'t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index be8a42c..6a6a233 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎SSID‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎Device MAC address‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎Randomized MAC address‎‏‎‎‏‎"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎IP address‎‏‎‎‏‎"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎Network details‎‏‎‎‏‎"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎Subnet mask‎‏‎‎‏‎"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎Type a valid gateway address.‎‏‎‎‏‎"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎Type a valid DNS address.‎‏‎‎‏‎"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎Type a network prefix length between 0 and 32.‎‏‎‎‏‎"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎DNS 1‎‏‎‎‏‎"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎DNS 2‎‏‎‎‏‎"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎DNS 1 (unless overridden by Private DNS)‎‏‎‎‏‎"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎DNS 2 (unless overridden by Private DNS)‎‏‎‎‏‎"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎Gateway‎‏‎‎‏‎"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎Network prefix length‎‏‎‎‏‎"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎Wi‑Fi Direct‎‏‎‎‏‎"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎Not set up - Work profile‎‏‎‎‏‎"</string>
     <string name="user_admin" msgid="4024553191395768119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎Admin‎‏‎‎‏‎"</string>
     <string name="user_you" msgid="3070562015202859996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎You (‎‏‎‎‏‏‎<xliff:g id="NAME">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎Nickname‎‏‎‎‏‎"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="USER_COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ users‎‏‎‎‏‎"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎Only the tablet’s owner can manage users.‎‏‎‎‏‎"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎Only the phone’s owner can manage users.‎‏‎‎‏‎"</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎Back‎‏‎‎‏‎"</string>
     <string name="wizard_next" msgid="3884832431439072471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎Next‎‏‎‎‏‎"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎Finish‎‏‎‎‏‎"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎Take a photo‎‏‎‎‏‎"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎Choose an image‎‏‎‎‏‎"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎Select photo‎‏‎‎‏‎"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎SIM cards‎‏‎‎‏‎"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎SIM cards‎‏‎‎‏‎"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎Unavailable when connected to ‎‏‎‎‏‏‎<xliff:g id="CARRIER">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="see_more" msgid="7499355691042812723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎See more‎‏‎‎‏‎"</string>
     <string name="see_less" msgid="2642392725363552793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎See less‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎Turn off ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎Turn off SIM?‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎Turning off SIM‎‏‎‎‏‏‎<xliff:g id="ELLIPSIS">…</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎Can\'t disable carrier‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎Something went wrong and your carrier could not be disabled.‎‏‎‎‏‎"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎Connect to device‎‏‎‎‏‎"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APPNAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ app wants to use a temporary Wi‑Fi network to connect to your device‎‏‎‎‏‎"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎No devices found. Make sure devices are turned on and available to connect.‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2151a39..051aa40 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, huella digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Usa tu rostro y huella digital para desbloquear el teléfono"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"También puedes usarlo para acceder a apps y confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloquea el teléfono con facilidad"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloquea el teléfono desde el bolsillo"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omitir"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Siguiente"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Se agregó el rostro"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar el desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella digital no sea tan segura como un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarla si la pierdes o te la roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si proteges tu teléfono con una opción de bloqueo de pantalla, y lo pierdes o te lo roban, nadie podrá usarlo. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarla si la pierdes o te la roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si proteges tu teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"¿Omitir configuración del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"¿Omitir configuración de la contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"¿Omitir configuración del patrón?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurar el método secundario de bloqueo de pantalla"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Elige el método secundario de bloqueo de pantalla"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opciones de bloqueo de la pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opciones de bloqueo de la pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial y contraseña"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sin el desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear tu teléfono con el reconocimiento facial. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Datos biométricos + patrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Datos biométricos + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Datos biométricos + contraseña"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sin configurar datos biométricos"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puedes desbloquear el teléfono con tus datos biométricos. Por razones de seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada: admin, encriptación o credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Dirección MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Dirección MAC aleatoria"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Dirección IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subred"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escribe una dirección de puerta de enlace válida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escribe una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escribe una longitud de prefijo de red entre 0 y 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que lo anule un DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que lo anule un DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud de prefijo de red"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi directo"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Establece una contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Establece patrón para desbloqueo facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Establece PIN para desbloqueo facial"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para datos biométricos, elige contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para datos biométricos, elige un patrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para datos biométricos, elige un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"¿Olvidaste la contraseña?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"¿Olvidaste el patrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"¿Olvidaste el PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Sin configurar: perfil de trabajo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Seudónimo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puedes agregar hasta <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo los propietarios de la tablet pueden administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo los propietarios del dispositivo pueden administrar los usuarios."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atrás"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Siguiente"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tomar una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Elegir una imagen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarjetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarjetas SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando estás conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver más"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Quieres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Quieres desactivar la tarjeta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No se puede inhabilitar el proveedor"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se produjo un error y no se pudo inhabilitar tu proveedor."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar al dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"La app de <xliff:g id="APPNAME">%1$s</xliff:g> quiere usar una red Wi-Fi temporal para conectarse a tu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No se encontraron dispositivos. Asegúrate de que los dispositivos estén encendidos y puedan conectarse."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index eca84aa..6f727a8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla y huella digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloquea el móvil de forma segura con tu cara y huella"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"También puedes iniciar sesión en apps y confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Haz que desbloquear tu móvil sea fácil"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ahorra tiempo desbloqueando tu teléfono desde el bolsillo"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Saltar"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Siguiente"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Cara añadida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura el desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes utilizar tu huella digital 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_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si proteges el tablet con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si proteges el dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si proteges el teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si proteges tu teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"¿No quieres configurar un PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"¿No quieres configurar la contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"¿No quieres configurar el patrón?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurar un método de bloqueo de pantalla alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Selecciona un método de bloqueo de pantalla alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opciones de bloqueo de pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opciones de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial + contraseña"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sin el desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear el teléfono con tu cara. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometría y patrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometría y PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometría y contraseña"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sin biometría"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puedes desbloquear tu teléfono con biometría. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada por admin., política cifrado o almac. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Dirección MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Dirección MAC aleatoria"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Dirección IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subred"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduce una dirección de puerta de enlace válida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduce una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduce un prefijo de red que tenga entre 0 y 32 caracteres."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que un DNS privado lo anule)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que un DNS privado lo anule)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud del prefijo de red"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Para usar el desbloqueo facial, establece una contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Para usar el desbloqueo facial, establece un patrón"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Para usar el desbloqueo facial, establece un PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar la biometría, elige una contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar la biometría, elige un patrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar la biometría, elige un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"¿Has olvidado la contraseña?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"¿Has olvidado el patrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"¿Has olvidado el PIN?"</string>
@@ -2733,7 +2714,7 @@
     <string name="privacy_settings_title" msgid="6437057228255974577">"Copia de seguridad"</string>
     <string name="backup_summary_state_on" msgid="9018954639693085240">"Activada"</string>
     <string name="backup_summary_state_off" msgid="5341339397224835909">"Desactivada"</string>
-    <string name="backup_section_title" msgid="6539706829848457794">"Copia de seguridad"</string>
+    <string name="backup_section_title" msgid="6539706829848457794">"Copia de seguridad y restauración"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Datos personales"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Copia de seguridad de mis datos"</string>
     <string name="backup_data_summary" msgid="8054551085241427531">"Crear copia de seguridad de los datos de las aplicaciones, las contraseñas de redes Wi-Fi y otros ajustes en los servidores de Google"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Sin configurar: perfil de trabajo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apodo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puedes añadir hasta <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo el propietario del tablet puede administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo el propietario del teléfono puede administrar los usuarios."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Volver"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Siguiente"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Hacer una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Seleccionar una imagen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarjetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarjetas SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar el PIN antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida el PIN para iniciarse?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar el patrón antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida el patrón para iniciarse?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar la contraseña antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Además de utilizar biometría para desbloquear tu dispositivo, puedes protegerlo aún más si lo configuras para solicitar el PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Además de utilizar biometría para desbloquear tu dispositivo, puedes protegerlo aún más si lo configuras para solicitar el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Además de utilizar biometría para desbloquear tu dispositivo, puedes mejorar su protección si lo configuras para solicitar la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando se está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver más"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Desactivar tarjeta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando tarjeta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"No se ha podido inhabilitar el operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se ha producido un error y no se ha podido inhabilitar tu operador."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar a dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"La aplicación <xliff:g id="APPNAME">%1$s</xliff:g> quiere usar una red Wi-Fi temporal para conectarse a tu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No se ha encontrado ningún dispositivo. Comprueba que estén encendidos y listos para conectarse."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8ebfdd4..b5a35bd 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekraanilukk, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekraanilukk, sõrmejälg"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekraanilukk"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Avage telefon turvaliselt oma näo ja sõrmejäljega"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Samuti saate rakendustesse sisse logida ja makseid kinnitada"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Seadistage avamine järgmisega."</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Muutke oma telefoni avamine imelihtsaks"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sõrmejälg"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Säästke aega, avades telefoni oma taskus"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Jäta vahele"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Järgmine"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Nägu on lisatud"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Seadistage Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: te ei saa kasutada oma sõrmejälge selle seadme avamiseks. Lisateabe saamiseks võtke ühendust oma organisatsiooni administraatoriga."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: teie sõrmejälg võib olla ebaturvalisem kui tugev muster või PIN-kood."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Tühista"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tänan, ei"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jätka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Jäta vahele"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Järgmine"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kaitstes oma tahvelarvuti ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kaitstes oma seadme ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kaitstes oma telefoni ekraanilukuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraanilukku on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kaitstes oma tahvelarvutit ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kaitstes oma seadet ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kaitstes oma telefoni ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Kas jätta PIN-koodi määramine vahele?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Kas jätta parooli määramine vahele?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Kas jätta mustri määramine vahele?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Varuekraaniluku meetodi seadistamine"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Valige oma ekraaniluku varumeetod"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekraaniluku valikud"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekraaniluku valikud"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekraanilukk"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + parool"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Jätka ilma Face Unlockita"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefoni võite avada oma näoga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biomeetria ja muster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biomeetria ja PIN-kood"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biomeetria ja parool"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Jätka ilma biomeetriata"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefoni saate avada oma biomeetriaga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administraator, krüpteerimiseeskirjad või mandaatide salvestusruum on selle keelanud"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pühkimine"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Seadme MAC-aadress"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Juhulikustatud MAC-aadress"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-aadress"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Võrgu üksikasjad"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alamvõrgu mask"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sisestage kehtiv lüüsi aadress."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sisestage kehtiv DNS-aadress."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sisestage võrgu eesliide pikkusega 0 kuni 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (kui privaatne DNS pole seda alistanud)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (kui privaatne DNS pole seda alistanud)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Lüüs"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Võrgu prefiksi pikkus"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WiFi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Määrake Face Unlocki kasutamiseks parool"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Määrake Face Unlocki kasutamiseks muster"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Määrake Face Unlocki kasutamiseks PIN-kood"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biomeetria kasutamiseks määrake parool"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biomeetria kasutamiseks määrake muster"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biomeetria kasutamiseks määrake PIN-kood"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Kas unustasite parooli?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Kas unustasite mustri?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Kas unustasite PIN-koodi?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Seadistamata – tööprofiil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administraator"</string>
     <string name="user_you" msgid="3070562015202859996">"Teie (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Hüüdnimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Saate lisada kuni <xliff:g id="USER_COUNT">%1$d</xliff:g> kasutajat"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Ainult telefoni omanik saab hallata kasutajaid."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tagasi"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Järgmine"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Lõpeta"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Pildista"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vali pilt"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto valimine"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kaardid"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kaardid"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel PIN-koodi. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel PIN-koodi?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel mustrit. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel mustrit?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel parooli. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel parooli?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel PIN-koodi. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel PIN-koodi?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel mustrit. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel mustrit?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel parooli. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel parooli?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Jah"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Piiratud"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Pole saadaval, kui on ühendus on loodud operaatoriga <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Kuva rohkem"</string>
     <string name="see_less" msgid="2642392725363552793">"Kuva vähem"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kas lülitada <xliff:g id="CARRIER_NAME">%1$s</xliff:g> välja?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kas lülitada SIM-kaart välja?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kaardi väljalülitamine <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaatorit ei saa keelata"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Midagi läks valesti ja teie operaatorit ei saanud keelata."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Seadmega ühendamine"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Rakendus <xliff:g id="APPNAME">%1$s</xliff:g> soovib kasutada ajutist WiFi-võrku, et teie seadmega ühendus luua"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Seadmeid ei leitud. Veenduge, et seadmed oleksid sisse lülitatud ja ühendamiseks saadaval."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6f16d20..dfc7255 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Pantailaren blokeoa, aurpegiaren bidez desblokeatzea"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Pantailaren blokeoa, hatz-marka"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Pantailaren blokeoa"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desblokeatu telefonoa segurtasunez aurpegiarekin eta hatz-markarekin"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Aplikazioetan saioa has dezakezu, eta ordainketak berretsi"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfiguratu desblokeatzeko eginbidea honekin:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desblokeatu aurpegiaren bidez"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Erraztu telefonoa desblokeatzeko prozesua"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Hatz-marka"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desblokeatu telefonoa poltsikoan denbora aurrezteko"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Saltatu"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Hurrengoa"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gehitu da aurpegia"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfiguratu aurpegiaren bidez desblokeatzeko eginbidea"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Aurpegiaren bidez desblokeatzeko eginbidea"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu erabili hatz-marka gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Utzi"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ez, eskerrik asko"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Egin aurrera"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltatu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Hurrengoa"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Tableta pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Gailua pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonoa pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Tableta pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Gailua pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonoa pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN kodearen konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pasahitzaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ereduaren konfigurazioa saltatu nahi duzu?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Konfiguratu pantailaren blokeoaren ordezko metodoa"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Pantaila blokeatzeko aukerak"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Pantaila blokeatzeko aukerak"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Pantailaren blokeoa"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Aurpegiaren bidez desblokeatzea + pasahitza"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Egin aurrera aurpegiaren bidez desblokeatzeko eginbidea gabe"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Aurpegia erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sistema biometrikoak + Eredua"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sistema biometrikoak + PIN kodea"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sistema biometrikoak + Pasahitza"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Egin aurrera sistema biometrikorik gabe"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Sistema biometrikoak erabil ditzakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administratzaileak, enkriptatze-gidalerroek edo kredentzialen biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hatza pasatzea"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Gailuaren MAC helbidea"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ausaz antolatutako MAC helbidea"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP helbidea"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Sarearen xehetasunak"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Azpisarearen maskara"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Idatzi baliozko atebide-helbidea."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Idatzi baliozko DNS helbidea."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Idatzi 0 eta 32 karaktere arteko sare-aurrizkia."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (DNS pribatuak ordezten ez duen kasuetan)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (DNS pribatuak ordezten ez duen kasuetan)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Atebidea"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Sare-aurrizkiaren luzera"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Aurpegiaren bidez desblokeatzeko, ezarri pasahitza"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Aurpegiaren bidez desblokeatzeko, ezarri eredua"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Aurpegiaren bidez desblokeatzeko, ezarri PINa"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ezarri pasahitza"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ezarri eredua"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ezarri PIN kodea"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Pasahitza ahaztu zaizu?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Eredua ahaztu zaizu?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN kodea ahaztu zaizu?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Konfiguratu gabe: laneko profila"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratzailea"</string>
     <string name="user_you" msgid="3070562015202859996">"Zu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Goitizena"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> erabiltzaile gehi ditzakezu gehienez"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Tabletaren jabeak baino ezin ditu erabiltzaileak kudeatu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Telefonoaren jabeak baino ezin ditu erabiltzaileak kudeatu."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atzera"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Hurrengoa"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Amaitu"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Atera argazki bat"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Aukeratu irudi bat"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Hautatu argazkia"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM txartelak"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM txartelak"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Bai"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ez"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Murriztapena du"</string>
@@ -4697,7 +4671,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Baimendu aplikazioari Wi-Fi konexioa kontrolatzea"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Baimendu aplikazio honi wifi-konexioa aktibatzea edo desaktibatzea, wifi-sareak bilatzea eta haietara konektatzea, sareak gehitzea edo kentzea, edota wifi-gune lokalak sortzea"</string>
     <string name="media_output_title" msgid="8283629315159510680">"Erreproduzitu multimedia-edukia hemen:"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"Erreproduzitu <xliff:g id="LABEL">%s</xliff:g> gailu honetan"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"Erreproduzitu <xliff:g id="LABEL">%s</xliff:g> hemen"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Gailu hau"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"Telefonoa"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"Tableta"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
     <string name="see_more" msgid="7499355691042812723">"Ikusi gehiago"</string>
     <string name="see_less" msgid="2642392725363552793">"Ikusi gutxiago"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> desaktibatu nahi duzu?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM txartela desaktibatu nahi duzu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM txartela desaktibatzen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ezin da desgaitu operadorea"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazoren bat izan da, eta ezin izan da desgaitu operadorea."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Konektatu gailura"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak aldi baterako wifi-sare bat erabili nahi du zure gailura konektatzeko"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ez da aurkitu gailurik. Ziurtatu gailuak piztuta daudela eta konekta daitezkeela."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 37622bb..33a11d8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="5541738710521607130">"نه"</string>
     <string name="create" msgid="986997212165228751">"ایجاد"</string>
     <string name="allow" msgid="3763244945363657722">"مجاز است"</string>
-    <string name="deny" msgid="7326117222944479942">"اجازه ندارد"</string>
+    <string name="deny" msgid="7326117222944479942">"مجاز نبودن"</string>
     <string name="confirmation_turn_on" msgid="2979094011928347665">"روشن کردن"</string>
     <string name="device_info_default" msgid="1406619232867343310">"ناشناس"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل صفحه، باز کردن قفل با چهره"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل صفحه، اثر انگشت"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"قفل صفحه"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"قفل تلفن را به‌طور ایمن با چهره و اثر انگشتتان باز کنید"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"همچنین می‌توانید به سیستم برنامه‌ها وارد شوید و پرداخت را تأیید کنید"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"راه‌اندازی قفل‌گشایی با:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"بازگشایی با چهره"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"قفل تلفن را مثل آب خوردن باز کنید"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"اثر انگشت"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"صرفه‌جویی در وقت با قفل‌گشایی تلفن در جیب"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"رد شدن"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"بعدی"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"چهره افزوده شد"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"راه‌اندازی بازگشایی با چهره"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"بازگشایی با چهره"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از اثر انگشتتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: ممکن است امنیت اثر انگشت از یک الگو یا پین قوی کمتر باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"لغو"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نه متشکرم"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ادامه"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"رد شدن"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"بعدی"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"راه‌اندازی پین رد شود؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"راه‌اندازی گذرواژه رد شود؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"راه‌اندازی الگو رد شود؟"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این رایانه لوحی استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"روش قفل صفحه پشتیبانتان را تنظیم کنید"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"گزینه‌های قفل صفحه"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"گزینه‌های قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"قفل صفحه"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"بازگشایی با چهره + گذرواژه"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ادامه بدون «بازگشایی با چهره»"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"می‌توانید با استفاده از چهره‌تان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"زیست‌سنجشی + الگو"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"زیست‌سنجشی + پین"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"زیست‌سنجشی + گذرواژه"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ادامه دادن بدون زیست‌سنجشی"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"می‌توانید بااستفاده از زیست‌سنجشی، قفل تلفنتان را باز کنید. بنا به دلایل ایمنی، افزودن قفل صفحه پشتیبان برای این گزینه الزامی است."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"توسط سرپرست غیرفعال شده، طبق خط‌مشی رمزگذاری یا حافظه اطلاعات کاربردی"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"خالی"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"تند کشیدن"</string>
@@ -988,7 +970,7 @@
     <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"‏برای بهبود دقت موقعیت مکانی و مقاصد دیگر، برنامه‌ای ناشناس می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی‌که Wi-Fi خاموش است.\n\nاین مورد برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز شود؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"برای خاموش کردن این مورد، در منوی سرریز، به «پیشرفته» بروید."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"مجاز است"</string>
-    <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"اجازه ندارد"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"مجاز نبودن"</string>
     <string name="wifi_hotspot_title" msgid="1918712370697971229">"برای اتصال، وارد سیستم می‌شوید؟"</string>
     <string name="wifi_hotspot_message" msgid="5245614124614833169">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد قبل از اتصال به شبکه، به صورت آنلاین وارد سیستم شوید."</string>
     <string name="wifi_hotspot_connect" msgid="1916314048788438331">"اتصال"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏نشانی MAC دستگاه"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏نشانی MAC تصادفی"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏نشانی IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"پوشش زیرشبکه"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"یک آدرس دروازه معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏یک آدرس DNS معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"یک پیشوند شبکه با طول بین 0 تا 32 نویسه تایپ کنید."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ساناد ۱ (مگراینکه «ساناد خصوصی» آن را ملغی کند)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ساناد ۲ (مگراینکه «ساناد خصوصی» آن را ملغی کند)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"دروازه"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"طول پیشوند شبکه"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏اتصال مستقیم Wi-Fi"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"برای استفاده از «بازگشایی با چهره»، گذرواژه تنظیم کنید"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"برای استفاده از «بازگشایی با چهره»، الگو تنظیم کنید"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"برای استفاده از «بازگشایی با چهره»، پین تنظیم کنید"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"تنظیم گذرواژه برای استفاده از زیست‌سنجشی"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"تنظیم الگو برای استفاده از زیست‌سنجشی"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"تنظیم پین برای استفاده از زیست‌سنجشی"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"گذرواژه را فراموش کردید؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"الگو را فراموش کردید؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"پین خود را فراموش کرده‌اید؟"</string>
@@ -1937,7 +1918,7 @@
     <string name="enable_compatibility" msgid="1163387233622859712">"مقیاس‌بندی برنامه"</string>
     <string name="unknown" msgid="8192160131923461175">"ناشناس"</string>
     <string name="sort_order_alpha" msgid="3400680865280266582">"مرتب سازی براساس نام"</string>
-    <string name="sort_order_size" msgid="7731928486199737223">"مرتب‌سازی براساس اندازه"</string>
+    <string name="sort_order_size" msgid="7731928486199737223">"به‌ترتیب اندازه"</string>
     <string name="sort_order_recent_notification" msgid="1496198895330443073">"جدیدترین"</string>
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"پرتکرارترین"</string>
     <string name="show_running_services" msgid="8666008279959853318">"نمایش سرویس‌های در حال اجرا"</string>
@@ -2132,7 +2113,7 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"همیشه به <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> برای ایجاد ابزارک‌ها و دسترسی به اطلاعات آن‌ها اجازه داده شود"</string>
     <string name="usage_stats_label" msgid="6523644917803320085">"آمار کاربرد"</string>
     <string name="testing_usage_stats" msgid="4660643799010906365">"آمار کاربرد"</string>
-    <string name="display_order_text" msgid="7120394778684605892">"ترتیب براساس:"</string>
+    <string name="display_order_text" msgid="7120394778684605892">"به‌ترتیب:"</string>
     <string name="app_name_label" msgid="3809910527680143673">"برنامه"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"آخرین زمان استفاده"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"زمان استفاده"</string>
@@ -2363,7 +2344,7 @@
     <string name="accessibility_service_action_perform_title" msgid="1449360056585337833">"مشاهده و انجام کنش‌ها"</string>
     <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"این عملکرد می‌تواند با برنامه یا حسگری سخت‌افزاری تعاملاتتان را ردیابی کند و ازطرف شما با برنامه‌ها تعامل داشته باشد."</string>
     <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"مجاز"</string>
-    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"رد کردن"</string>
+    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"مجاز نبودن"</string>
     <string name="accessibility_dialog_button_stop" msgid="7295448112784528196">"توقف"</string>
     <string name="accessibility_dialog_button_cancel" msgid="4813234247237851121">"لغو"</string>
     <string name="disable_service_title" msgid="2909108731776956167">"«<xliff:g id="SERVICE">%1$s</xliff:g>» متوقف شود؟"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"تنظیم نشده - نمایه کاری"</string>
     <string name="user_admin" msgid="4024553191395768119">"سرپرست"</string>
     <string name="user_you" msgid="3070562015202859996">"شما (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"نام مستعار"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"تا <xliff:g id="USER_COUNT">%1$d</xliff:g> کاربر می‌توانید اضافه کنید"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"فقط صاحب رایانه لوحی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"فقط صاحب گوشی می‌تواند کاربران را مدیریت کند."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"برگشت"</string>
     <string name="wizard_next" msgid="3884832431439072471">"بعدی"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"پایان"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"عکس گرفتن"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"انتخاب تصویر"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"انتخاب عکس"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"سیم‌کارت‌ها"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"سیم‌کارت‌ها"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"علاوه بر استفاده از چهره رای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"علاوه بر استفاده از چهره برای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن الگو موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن الگو الزامی است؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"علاوه بر استفاده از چهره‌تان برای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن گذرواژه برای راه‌اندازی دستگاهتان الزامی شود؟"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"علاوه‌بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه می‌توانید وارد کردن پین را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن پین برای راه‌اندازی دستگاه الزامی شود؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"علاوه بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه می‌توانید وارد کردن الگو را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن الگو برای راه‌اندازی دستگاه الزامی شود؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"علاوه بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه، می‌توانید وارد کردن گذرواژه را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن گذرواژه برای راه‌اندازی دستگاه الزامی شود؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"بله"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"نه"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محدودشده"</string>
@@ -4118,8 +4092,8 @@
     <string name="memory_details" msgid="6133226869214421347">"جزئیات"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"<xliff:g id="SIZE">%1$s</xliff:g> متوسط حافظه استفاده شده در ۳ ساعت گذشته"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"در ۳ ساعت گذشته از حافظه استفاده نشده است"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"مرتب‌سازی براساس مصرف متوسط"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"مرتب‌سازی براساس حداکثر مصرف"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"به‌ترتیب مصرف متوسط"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"به‌ترتیب حداکثر مصرف"</string>
     <string name="memory_performance" msgid="5448274293336927570">"عملکرد"</string>
     <string name="total_memory" msgid="5244174393008910567">"کل حافظه"</string>
     <string name="average_used" msgid="690235917394070169">"مصرف متوسط (%)"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"هنگام اتصال به <xliff:g id="CARRIER">%1$s</xliff:g>، دردسترس نیست"</string>
     <string name="see_more" msgid="7499355691042812723">"موارد بیشتر"</string>
     <string name="see_less" msgid="2642392725363552793">"مشاهده موارد کمتر"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> خاموش شود؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"سیم‌کارت خاموش شود؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"خاموش کردن سیم‌کارت<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"شرکت مخابراتی غیرفعال نشد"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"مشکلی پیش آمد و شرکت مخابراتی‌تان غیرفعال نشد."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"اتصال به دستگاه"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏برنامه <xliff:g id="APPNAME">%1$s</xliff:g> برای اتصال به دستگاهتان می‌خواهد از شبکه Wi-Fi موقت استفاده کند"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"دستگاهی پیدا نشد. مطمئن شوید دستگاه‌ها روشن و برای اتصال دردسترس هستند."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aa55e40..7c1f359 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Näytön lukitus, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Näytön lukitus, sormenjälki"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Näytön lukitus"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Avaa puhelimen lukitus kasvoilla ja sormenjäljellä"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Voit myös kirjautua sovelluksiin ja vahvistaa maksuja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ota käyttöön lukituksen avaus tällä:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Helpota puhelimen lukituksen avaamista"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sormenjälki"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Säästä aikaa avaamalla puhelin taskussa"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ohita"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seuraava"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Kasvot lisätty"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ota Face Unlock käyttöön"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Tämän laitteen lukitusta ei voi avata sormenjäljellä. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Peruuta"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ei kiitos"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jatka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ohita"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seuraava"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kun suojaat tablettisi näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kun suojaat laitteen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kun suojaat puhelimen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kun suojaat tabletin näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kun suojaat laitteen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kun suojaat puhelimen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ohitetaanko PIN-koodin asetus?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ohitetaanko salasanan asetus?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ohitetaanko kuvion asetus?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Määritä näytön varalukitustapa"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Valitse toissijainen näytönlukitustapa"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Näytön lukitusvaihtoehdot"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Näytön lukitusvaihtoehdot"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Näytön lukitus"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock ja salasana"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Jatka ilman Face Unlockia"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Voit avata puhelimen lukituksen kasvojentunnistuksella. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriikka + kuvio"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriikka + PIN-koodi"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriikka + salasana"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Jatka ilman biometriikkaa"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Voit avata puhelimen lukituksen biometriikalla. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Järj.valvojan, salauskäyt. tai tunnuksien tall.tilan estämä"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pyyhkäisy"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Laitteen MAC-osoite"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Satunnaistettu MAC-osoite"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-osoite"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Verkon tiedot"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Aliverkon peite"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Anna kelvollinen yhdyskäytävän osoite."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Anna kelvollinen nimipalvelun osoite."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Anna verkon etuliite, jonka pituus on välillä 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ellei ohitettu yksityisellä DNS:llä)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ellei ohitettu yksityisellä DNS:llä)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Verkon etuliitteen pituus"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1441,8 +1425,8 @@
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"Tyhjennä USB-tila"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"Tyhjennä SD-kortti"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
-    <string name="sd_format_summary" product="default" msgid="60583152211068164">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai kuvat."</string>
+    <string name="sd_format_summary" product="default" msgid="60583152211068164">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja kuvat"</string>
     <string name="memory_clear_cache_title" msgid="2605096903803953619">"Tyhjennetäänkö välimuistitiedot?"</string>
     <string name="memory_clear_cache_message" msgid="4759561226480906588">"Sovellusten välimuistit tyhjennetään."</string>
     <string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"MTP- tai PTP-toiminto on käytössä"</string>
@@ -1502,7 +1486,7 @@
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Kun tämä <xliff:g id="NAME_0">^1</xliff:g> poistetaan, siihen tallennetut sovellukset lakkaavat toimimasta eivätkä mediatiedostot ole käytettävissä ennen kuin se liitetään uudelleen."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> on alustettu niin, että se toimii vain tämän laitteen kanssa."</string>
     <string name="storage_internal_forget_details" msgid="5606507270046186691">"Jos haluat käyttää tallennuslaitteen <xliff:g id="NAME">^1</xliff:g> sisältämiä sovelluksia, kuvia tai tietoja, liitä se uudelleen. \n\nVoit myös halutessasi unohtaa tämän tallennuslaitteen, jos se ei ole käytettävissä. \n\nJos päätät unohtaa laitteen, menetät kaikki sen sisältämät tiedot lopullisesti. \n\nVoit asentaa sovellukset uudelleen myöhemmin, mutta niiden laitteelle tallentamat tiedot menetetään."</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Unohdetaanko <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, valokuvat ja tiedot poistetaan pysyvästi."</string>
+    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, kuvat ja tiedot poistetaan pysyvästi."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"Sovellukset"</string>
     <string name="storage_detail_images" msgid="6003883845718804371">"Kuvahaku"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"Videot"</string>
@@ -1651,8 +1635,8 @@
     <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Jos haluat poistaa musiikin, kuvat ja muun käyttäjädatan, tyhjennä "<b>"SD-kortti"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tyhjennä SD-kortti"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai kuvat."</string>
+    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai kuvat."</string>
     <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Poista kaikki data"</string>
     <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Poista kaikki data"</string>
     <string name="main_clear_final_desc" msgid="5800877928569039580">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Määritä salasana Face Unlockia varten"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Valitse kuvio Face Unlockia varten"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Määritä PIN-koodi Face Unlockia varten"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometriikka: aseta salasana"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometriikka: aseta kuvio"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometriikka: aseta PIN-koodi"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Unohditko salasanasi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Unohditko kuviosi?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Unohditko PIN-koodisi?"</string>
@@ -2747,7 +2728,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Haluatko lopettaa Wi-Fi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Lopetetaanko laitteen tietojen (kuten Wi-Fi-salasanojen ja soittohistorian) ja sovellusten tietojen (kuten asetusten ja sovellusten tallentamien tiedostojen) automaattinen varmuuskopiointi? Myös vanhat varmuuskopiot poistetaan etäpalvelimilta."</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja valokuvia."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja kuvia."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Laitteenhallinnan asetukset"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Laitteenhallintasovellus"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Poista laitteenhallintasovellus käytöstä"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ei määritetty – työprofiili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Järjestelmänvalvoja"</string>
     <string name="user_you" msgid="3070562015202859996">"Sinä (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Lempinimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Voit lisätä korkeintaan <xliff:g id="USER_COUNT">%1$d</xliff:g> käyttäjää."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Vain tablet-laitteen omistaja voi hallita käyttäjiä."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Vain puhelimen omistaja voi hallita käyttäjiä."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Takaisin"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seuraava"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Valmis"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ota kuva"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Valitse kuva"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Valitse valokuva"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kortit"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kortit"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuvion antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta pyytämällä salasanaa ennen käynnistymistä. Laite ei vastaanota puheluita, viestejä tai ilmoituksia, esimerkiksi herätyksiä, ennen kuin se on käynnistynyt.\n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen tietoja. Otetaanko salasanan pyytäminen käynnistettäessä käyttöön?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodia laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuviota laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta entisestään pyytämällä salasanaa ennen käynnistymistä. Laite ei vastaanota puheluita, viestejä tai ilmoituksia, esimerkiksi herätyksiä, ennen kuin se on käynnistynyt.\n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen tietoja. Vaaditaanko salasanaa laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Kyllä"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Rajoitettu"</string>
@@ -4078,7 +4052,7 @@
     <string name="usb_use_file_transfers" msgid="483915710802018503">"Tiedostonsiirto"</string>
     <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Siirrä tiedostoja toiselle laitteelle."</string>
     <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Siirrä valokuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
+    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Siirrä kuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
     <string name="usb_use_tethering" msgid="2897063414491670531">"Internetin jakaminen USB:n kautta"</string>
     <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="6464135515868405143">"Käytä tätä laitetta MIDI-tilassa."</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ei käytettävissä <xliff:g id="CARRIER">%1$s</xliff:g> ‑käytön aikana"</string>
     <string name="see_more" msgid="7499355691042812723">"Lisää"</string>
     <string name="see_less" msgid="2642392725363552793">"Näytä vähemmän"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Laitetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> pois päältä?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Laitetaanko SIM-kortti pois päältä?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Laitetaan SIM-korttia pois päältä<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaattoria ei voi poistaa käytöstä"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Jotain meni pieleen. Operaattoria ei voitu poistaa käytöstä."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Laitteeseen yhdistäminen"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> haluaa käyttää väliaikaista Wi-Fi-verkkoa laitteeseen yhdistämiseksi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Laitteita ei löytynyt. Varmista, että laitteet ovat päällä ja voivat muodostaa yhteyden."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 244daff..7b4a28e 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, déverrouillage par reconnaissance du visage"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreintes digitales"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Verrouillage de l\'écran"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Déverr. votre tél. avec votre visage et votre empr. digitale"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Connectez-vous à des applications et confirmez vos paiements"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurer le déverrouillage avec :"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Déverrouill. par reconn. faciale"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplifiez le déverrouillage du téléphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empreinte digitale"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Déverr. votre téléphone dans votre poche"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ignorer"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Suivant"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurer le déverrouillage par reconnaissance faciale"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Déverrouill. par reconn. faciale"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser vos empreintes digitales pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un NIP fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non merci"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Passer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"En protégeant votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"En protégeant votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"En protégeant votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"En protégeant votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"En protégeant votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ignorer la configuration du NIP?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ignorer la configuration du mot de passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ignorer la configuration du schéma?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurer le mode de verrouillage d\'écran d\'arrière-plan"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Options de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Verrouillage de l\'écran"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Déverr. par reconn. faciale + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuer sans configurer le déverr. par reconn. faciale"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone avec votre visage. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Données biométriques et schéma"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Données biométriques et NIP"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Données biométriques et mot de passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuer sans configurer les données biométriques"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Vous pouvez déverrouiller votre téléphone avec vos données biométriques. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par admin., politique cryptage, stock. authentifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayer l\'écran"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresse MAC de l\'appareil"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresse MAC aléatoire"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresse IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Infos sur le réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Masque de sous-réseau"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Saisissez une adresse de passerelle valide."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Saisissez une adresse DNS correcte."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Le préfixe réseau doit être compris entre 0 et 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sauf si un DNS privé ignore ce paramètre)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sauf si un DNS privé ignore ce paramètre)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longueur préfixe réseau"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Pour util. dév. par rec. faciale, créer mot de passe"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Pour util. dév. par rec. faciale, config. schéma"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Pour util. dév. par rec. faciale, config. NIP"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Pour util. donn. bio., déf. mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Pour util. données bio., déf. un schéma"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Pour util. données bio., défin. un NIP"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Mot de passe oublié?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Schéma oublié?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"NIP oublié?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configuré : profil professionnel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonyme"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_COUNT">%1$d</xliff:g> utilisateurs"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Précédent"</string>
     <string name="wizard_next" msgid="3884832431439072471">"SUIVANT"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminer"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Prendre une photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Sélectionner une image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Sélectionner une photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartes SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le mot de passe pour démarrer l\'appareil?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appels, de messages ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appel, de message ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appels, de messages, ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restreinte"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque vous êtes connectés au réseau de <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"En voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"En voir moins"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM en cours<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossible de désactiver le fournisseur de services"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Une erreur s\'est produite et le fournisseur de services n\'a pas pu être désactivé."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Se connecter à l’appareil"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour se connecter à votre appareil"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Aucun appareil trouvé. Assurez-vous que l\'appareil est allumé et prêt à se connecter."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a69befb..1c87893 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreinte digitale"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Verrouillage de l\'écran"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Profitez du déverrouillage par visage et empreinte digitale"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Connectez-vous aux applications et confirmez les paiements"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurez le déverrouillage par :"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Déverrouillez votre téléphone facilement"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empreinte digitale"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Déverrouillez le téléphone dans la poche"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Passer"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Suivant"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurer Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre empreinte digitale pour déverrouiller cet appareil. Pour en savoir plus, contactez l\'administrateur de votre entreprise."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un code fiable."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, merci"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si vous protégez votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si vous protégez votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si vous protégez votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si vous protégez votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Passer la configuration du code PIN ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Passer la configuration du mot de passe ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Passer la configuration du schéma ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurer le mode de verrouillage de secours de l\'écran"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choisissez une méthode secondaire de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Options de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Verrouillage de l\'écran"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuer sans Face Unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre visage. Pour plus de sécurité, cette option doit être associée à un mode de verrouillage d\'écran secondaire."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Authentification biométrique + Schéma"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Authentification biométrique + Code"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Authentification biométrique + Mot de passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuer sans authentification biométrique"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Vous pouvez déverrouiller votre téléphone par authentification biométrique. Pour plus de sécurité, définissez une méthode secondaire de verrouillage de l\'écran."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par l\'admin, règles chiffrement, stockage ID"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayer l\'écran"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresse MAC de l\'appareil"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresse MAC aléatoire"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresse IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Détails du réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Masque de sous-réseau"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Saisissez une adresse de passerelle valide."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Saisissez une adresse DNS correcte."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Le préfixe réseau doit être compris entre 0 et 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sauf si un DNS privé a la priorité)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sauf si un DNS privé a la priorité)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longueur du préfixe réseau"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Pour utiliser Face Unlock, définissez un mot de passe"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Pour utiliser Face Unlock, définissez un schéma"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Pour utiliser Face Unlock, définissez un code"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biométrie : définir le mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biométrie : définir le schéma"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biométrie : définir le code"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Mot de passe oublié ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Schéma oublié ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Code oublié ?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configuré – Profil professionnel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrateur"</string>
     <string name="user_you" msgid="3070562015202859996">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonyme"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_COUNT">%1$d</xliff:g> utilisateurs."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Seul le propriétaire du téléphone peut gérer les utilisateurs."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Retour"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Suivant"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminer"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Prendre une photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choisir une image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Sélectionner une photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartes SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre code avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du code avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre schéma avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du schéma avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre mot de passe avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du mot de passe avant le démarrage de votre appareil ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre code en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du code avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre schéma en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du schéma avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre mot de passe en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du mot de passe avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Utilisation restreinte"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"Moins de détails"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossible de désactiver l\'opérateur"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Un problème a empêché l\'appareil de désactiver votre opérateur."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connexion à l\'appareil"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour établir la connexion à votre appareil"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Aucun appareil trouvé. Assurez-vous que des appareils soient activés et prêts à être connectés."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index cd9b57a..80e1f91 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla e Desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, impresión dixital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloquea o teléfono usando a cara e a impresión dixital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Tamén podes iniciar sesión en aplicacións e confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloquea o teléfono a fume de carozo"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impresión dixital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Aforra tempo desbloqueando o teléfono no peto"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omitir"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seguinte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Engadiuse a cara"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura o desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: Non podes utilizar a impresión dixital 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_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: É posible que a impresión dixital sexa menos segura que un padrón ou un PIN fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, grazas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ao protexer a túa tableta cunha opción de bloqueo de pantalla, ninguén poderá utilizala se a perdes ou cha rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ao protexer o teu dispositivo cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ao protexer o teu teléfono cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ao protexer a túa tableta cunha opción de bloqueo de pantalla, ninguén poderá utilizala se a perdes ou cha rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ao protexer o teu dispositivo cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ao protexer o teu teléfono cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Queres omitir a configuración do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Queres omitir a configuración do contrasinal?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Queres omitir a configuración do padrón?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa as funcións de protección da tableta para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurar o método de bloqueo da pantalla en segundo plano"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolle o método de bloqueo da pantalla alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcións de bloqueo da pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcións de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial e contrasinal"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sen desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Podes desbloquear o teléfono utilizando a túa cara. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Autenticación biométrica + padrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Autenticación biométrica + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Autenticación biométrica + contrasinal"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Seguir sen autenticación biométrica"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Podes desbloquear o teléfono utilizando a autenticación biométrica. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desactivado por admin., encriptación ou almac. credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ningún"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pasa o dedo"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enderezo MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Enderezo MAC aleatorio"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Enderezo IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subrede"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escribe un enderezo de pasarela válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escribe un enderezo DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escribe un prefixo de rede con lonxitude de 0-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que o anule un DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que o anule un DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pasarela"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lonxitude prefixo de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Desbloqueo facial: cómpre un contrasinal"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Alternativa ao desbloqueo facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Alternativa ao desbloqueo facial"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Configura un contrasinal"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Configura un padrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Configura un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueciches o contrasinal?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueciches o padrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueciches o PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configurado: perfil de traballo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Ti (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Alcume"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Podes engadir ata <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Só o propietario da tableta pode xestionar usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Só o propietario do teléfono pode xestionar usuarios."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atrás"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seguinte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar unha foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escoller unha imaxe"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarxetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarxetas SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o PIN para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o padrón para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o contrasinal para iniciar o dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu PIN antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o PIN para iniciarse?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu padrón antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o padrón para iniciarse?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu contrasinal antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o contrasinal para iniciarse?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Si"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrinxido"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non dispoñible cando o dispositivo está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver máis"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Queres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Queres desactivar a SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Non se puido desactivar o operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Produciuse un erro e non se puido desactivar o operador."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar co dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A aplicación <xliff:g id="APPNAME">%1$s</xliff:g> quere utilizar unha rede wifi temporal para conectar co teu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Non se atoparon dispositivos. Asegúrate de que estean activados e dispoñibles para a conexión."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 0e7124a..1ed7dc6 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ડિવાઇસનું MAC ઍડ્રેસ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"રેન્ડમ કરેલું MAC ઍડ્રેસ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ઍડ્રેસ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"નેટવર્કની વિગતો"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"સબનેટ માસ્ક"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"એક માન્ય ગેટવે સરનામું લખો."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"એક માન્ય DNS સરનામું લખો."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 અને 32 વચ્ચે એક નેટવર્ક પ્રીફિક્સ લંબાઈ લખો."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (સિવાય કે ખાનગી DNS દ્વારા ઓવરરાઇડ કર્યું હોય)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (સિવાય કે ખાનગી DNS દ્વારા ઓવરરાઇડ કર્યું હોય)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ગેટવે"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"નેટવર્ક પ્રીફિક્સ લંબાઈ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
@@ -1970,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ઍપ્લિકેશન અક્ષમ કરો"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"જો તમે આ ઍપ બંધ કરશો, તો Android અને અન્ય ઍપ અપેક્ષા પ્રમાણે કાર્ય કરી શકશે નહીં. યાદ રાખો, તમે આ ઍપને ડિલીટ નહીં કરી શકો, કારણ કે તે તમારા ડિવાઇસમાં પહેલેથી ઇન્સ્ટૉલ થયેલી હતી. બંધ કરીને, તમે આ ઍપને માત્ર બંધ કરો છો અને તમારા ડિવાઇસમાં છુપાવો છો."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"સૂચનાઓ બંધ કરીએ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"દુકાન"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ઍપ્લિકેશનની વિગતો"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> માંથી ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશન"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"વધુ માહિતી <xliff:g id="APP_STORE">%1$s</xliff:g> પર મળશે"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"સેટ કરેલ નથી - કાર્યાલયની પ્રોફાઇલ"</string>
     <string name="user_admin" msgid="4024553191395768119">"એડમિન"</string>
     <string name="user_you" msgid="3070562015202859996">"તમે (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ઉપનામ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટેબ્લેટના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"પાછળ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"આગલું"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"સમાપ્ત"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ફોટો લો"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"છબી પસંદ કરો"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ફોટો પસંદ કરો"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"સિમ કાર્ડ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"સિમ કાર્ડ"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
     <string name="see_more" msgid="7499355691042812723">"વધુ જુઓ"</string>
     <string name="see_less" msgid="2642392725363552793">"ઓછું જુઓ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને બંધ કરીએ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"સિમ કાર્ડ બંધ કરીએ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"સિમ કાર્ડ બંધ કરી રહ્યાં છીએ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"મોબાઇલ ઑપરેટરને બંધ કરી શકાતા નથી"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"કંઈક ખોટું થયું હતું અને તમારા મોબાઇલ ઑપરેટરને બંધ કરી શક્યાં નથી."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ડિવાઇસ સાથે કનેક્ટ કરો"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ઍપ તમારા ડિવાઇસ સાથે કનેક્ટ થવા માટે હંગામી વાઇ-ફાઇ નેટવર્કનો ઉપયોગ કરવા માગે છે"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"કોઈ ડિવાઇસ મળ્યું નથી. ખાતરી કરો કે ડિવાઇસ ચાલુ છે અને કનેક્ટ કરવા માટે ઉપલબ્ધ છે."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 190aee0..3fc0026 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्‍क्रीन लॉक करने, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फ़िंगरप्रिंट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रीन लॉक"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"फ़िंगरप्रिंट और चेहरा पहचानने की सुविधा से, सुरक्षित तरीके से फ़ोन को अनलॉक करें"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"आप ऐप में साइन इन और पैसे चुकाने की पुष्टि भी कर सकते हैं"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"इनसे अनलॉक करने की सुविधा सेट करें:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"मालिक का चेहरा पहचानकर अनलॉक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"अपने फ़ोन को अनलॉक करना आसान बनाएं"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फ़िंगरप्रिंट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"फ़िंगरप्रिंट सेट अप करके फ़ोन को फटाफट अनलॉक करें"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"अभी नहीं"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"आगे बढ़ें"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"चेहरा जोड़ा गया"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करें"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"मालिक का चेहरा पहचानकर अनलॉक"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आप इस डिवाइस का लॉक खोलने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल नहीं कर सकते हैं. और जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करें"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"रहने दें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"आगे बढ़ें"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"अपना टैबलेट \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"अपना डिवाइस \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"अपना फ़ोन \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"अपने टैबलेट को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"अपने डिवाइस को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"अपने फ़ोन को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"पिन अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"पैटर्न अभी सेट अप नहीं करना चाहते?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"अपनी बैकअप स्‍क्रीन लॉक विधि सेट करें"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"स्क्रीन अनलॉक करने का दूसरा तरीका चुनें"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रीन लॉक के विकल्प"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रीन लॉक विकल्प"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रीन लॉक"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"मालिक का चेहरा पहचानकर अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"\'मालिक का चेहरा पहचानकर अनलॉक\' सेटअप किए बिना जारी रखें"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"आप अपने चेहरे के ज़रिए फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए, यह ज़रूरी है कि चेहरे के अलावा अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक्स + पैटर्न"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक्स + पिन"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक्स + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक्स सेट अप किए बिना जारी रखें"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"आप बायोमेट्रिक्स का इस्तेमाल करके, अपना फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए यह ज़रूरी है कि बायोमेट्रिक्स के अलावा, अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप करें"</string>
@@ -1000,7 +982,7 @@
     <string name="lost_internet_access_switch" msgid="7935665847081706202">"मोबाइल पर स्विच करें"</string>
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"वाई-फ़ाई पर रहें"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"फिर कभी ना दिखाएं"</string>
-    <string name="wifi_connect" msgid="2481467560349907397">"जोड़ दें"</string>
+    <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट करें"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाई-फ़ाई चालू किया गया"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</string>
     <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट हो रहा है"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"एसएसआईडी"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"डिवाइस का MAC पता"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"अनियमित चुना गया MAC पता"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"आईपी पता"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्क के बारे में जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"कोई मान्‍य गेटवे पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"कोई मान्‍य DNS पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 और 32 के बीच की लंबाई का नेटवर्क उपसर्ग लिखें."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"डीएनएस 1 (अगर निजी डीएनएस से बदला नहीं गया हो)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"डीएनएस 2 (अगर निजी डीएनएस से बदला नहीं गया हो)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लंबाई"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"वाई-फ़ाई डायरेक्ट"</string>
@@ -1241,7 +1225,7 @@
     <string name="night_display_auto_mode_title" msgid="5869128421470824381">"शेड्यूल करें"</string>
     <string name="night_display_auto_mode_never" msgid="2721729920187175239">"कोई नहीं"</string>
     <string name="night_display_auto_mode_custom" msgid="3938791496034086916">"अपने मुताबिक तय समय पर चालू करें"</string>
-    <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"शाम से सुबह तक चालू रहती है"</string>
+    <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"सूर्योदय से सूर्यास्त तक चालू रहती है"</string>
     <string name="night_display_start_time_title" msgid="2611541851596977786">"शुरू करने का समय"</string>
     <string name="night_display_end_time_title" msgid="5243112480391192111">"खत्म होने का समय"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"स्थिति"</string>
@@ -1256,8 +1240,8 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"सूर्योदय होने पर अपने आप बंद हो जाएगा"</string>
     <string name="night_display_activation_on_manual" msgid="7999294858026069365">"अभी चालू करें"</string>
     <string name="night_display_activation_off_manual" msgid="4842907786868153218">"अभी बंद करें"</string>
-    <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"सुबह तक के लिए चालू करें"</string>
-    <string name="night_display_activation_off_twilight" msgid="2853594955401726956">"शाम तक के लिए बंद करें"</string>
+    <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"सूर्योदय तक के लिए चालू करें"</string>
+    <string name="night_display_activation_off_twilight" msgid="2853594955401726956">"सूर्यास्त तक के लिए बंद करें"</string>
     <string name="night_display_activation_on_custom" msgid="4951143503599226846">"<xliff:g id="ID_1">%1$s</xliff:g> तक के लिए चालू करें"</string>
     <string name="night_display_activation_off_custom" msgid="79965738861100371">"<xliff:g id="ID_1">%1$s</xliff:g> तक बंद रखें"</string>
     <string name="night_display_not_currently_on" msgid="6600205753103093827">"नाइट लाइट इस समय चालू नहीं है"</string>
@@ -1265,12 +1249,12 @@
     <string name="twilight_mode_launch_location" msgid="7799112373591153956">"जगह की सेटिंग"</string>
     <string name="dark_ui_activation_on_manual" msgid="1541006734577325234">"अभी चालू करें"</string>
     <string name="dark_ui_activation_off_manual" msgid="2395333709291250065">"अभी बंद करें"</string>
-    <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"सुबह तक के लिए चालू करें"</string>
-    <string name="dark_ui_activation_off_auto" msgid="9136717444658505208">"शाम तक के लिए बंद करें"</string>
+    <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"सूर्योदय तक के लिए चालू करें"</string>
+    <string name="dark_ui_activation_off_auto" msgid="9136717444658505208">"सूर्यास्त तक के लिए बंद करें"</string>
     <string name="dark_ui_title" msgid="3373976268671557416">"गहरे रंग वाला मोड"</string>
     <string name="dark_ui_auto_mode_title" msgid="9027528859262295099">"शेड्यूल करें"</string>
     <string name="dark_ui_auto_mode_never" msgid="3980412582267787662">"कभी नहीं"</string>
-    <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"शाम से सुबह तक चालू रहती है"</string>
+    <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"सूर्योदय से सूर्यास्त तक चालू रहती है"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"अपने मुताबिक तय समय पर चालू करें"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"स्थिति"</string>
     <string name="dark_ui_summary_off" msgid="3897438633224959099">"बंद है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"पासवर्ड सेट करें"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"पैटर्न सेट करें"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"पिन सेट करें"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"अपना पासवर्ड भूल गए हैं?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"अपना पैटर्न भूल गए हैं?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"अपना पिन भूल गए हैं?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट नहीं की गई - वर्क प्रोफ़ाइल"</string>
     <string name="user_admin" msgid="4024553191395768119">"एडमिन"</string>
     <string name="user_you" msgid="3070562015202859996">"आप (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"प्रचलित नाम"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"आप <xliff:g id="USER_COUNT">%1$d</xliff:g> उपयोगकर्ता तक जोड़ सकते हैं"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"केवल टैबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"वापस जाएं"</string>
     <string name="wizard_next" msgid="3884832431439072471">"आगे बढ़ें"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"खत्म करें"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फ़ोटो खींचें"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"इमेज चुनें"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फ़ोटो चुनें"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"सिम कार्ड"</string>
@@ -3618,12 +3595,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"<xliff:g id="APP_NAME">%1$s</xliff:g> की सभी सूचनाएं"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"ज़रूरत के हिसाब से सूचनाएं"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
-      <item quantity="one">रोज़ ~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
+      <item quantity="one">रोज़~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
       <item quantity="other">रोज़ ~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
-      <item quantity="one">हर हफ़्ते ~<xliff:g id="NUMBER_1">%d</xliff:g>सूचनाएं</item>
-      <item quantity="other">हर हफ़्ते ~<xliff:g id="NUMBER_1">%d</xliff:g>सूचनाएं</item>
+      <item quantity="one">हर हफ़्ते~<xliff:g id="NUMBER_1">%d</xliff:g> सूचना</item>
+      <item quantity="other">हर हफ़्ते~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कभी नहीं"</string>
     <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचना का ऐक्सेस"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पिन से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पैटर्न से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पासवर्ड से ही खुले. डिवाइस के चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पिन भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पैटर्न भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पासवर्ड भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"हां"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"नहीं"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"रोक लगी है"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
     <string name="see_more" msgid="7499355691042812723">"ज़्यादा देखें"</string>
     <string name="see_less" msgid="2642392725363552793">"कम देखें"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> को बंद करना चाहते हैं?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"क्या आप सिम बंद करना चाहते हैं?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद किया जा रहा है<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सकता"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"कोई गड़बड़ी हुई, जिसकी वजह से आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सका."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"डिवाइस से कनेक्ट करें"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"आपके डिवाइस से कनेक्ट होने के लिए, <xliff:g id="APPNAME">%1$s</xliff:g> ऐप्लिकेशन को किसी वाई-फ़ाई नेटवर्क से कुछ समय के लिए जुड़ना होगा"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"कोई डिवाइस नहीं मिला देख लें कि डिवाइस चालू हों और कनेक्ट किए जा सकते हों."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 28f3ec9..48371be 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje zaslona, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje zaslona, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje zaslona"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sigurno otključajte telefon upotrebom lica i otiska prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Možete se prijavljivati u aplikacije i potvrditi plaćanje"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Postavite otključavanje pomoću:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Otključajte telefon u trenu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Otključajte telefon dok vam je u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalje"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Postavite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: ovaj uređaj ne možete otključati otiskom prsta. Za više informacija obratite se administratoru organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Odustani"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
@@ -458,12 +448,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Zaštite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Zaštite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Zaštite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Zaštite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje zaporke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Postavite pričuvni način zaključavanja zaslona"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite pričuvni način zaključavanja zaslona"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja zaslona"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje zaslona"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + zaporka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavi bez otključavanja licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon svojim licem. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrijski podaci + uzorak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrijski podaci + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrijski podaci + zaporka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavi s upotrebom biometrijskih podataka"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Možete otključati telefon upotrebom biometrijskih podataka. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prelazak prstom"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumično odabrana MAC adresa"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podaci o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Upišite važeću adresu pristupnika."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Upišite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Upišite prefiks mreže duljine između 0 i 32 znaka."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ako ga ne nadjača privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ako ga ne nadjača privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Duljina mrežnog prefiksa"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1835,12 +1819,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Otključavanje licem zahtijeva zaporku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Otključavanje licem zahtijeva uzorak"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Otključavanje licem zahtijeva PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Postavite zaporku za upotrebu biometrijskih podataka"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Postavite uzorak za upotrebu biometrijskih podataka"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Postavite PIN za upotrebu biometrijskih podataka"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste zaporku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste uzorak?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije postavljen – radni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Ne možete dodati više od <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tabletnog računala može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može upravljati korisnicima."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Natrag"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalje"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Završi"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Snimite fotografiju"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Odabir slike"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Osim otključavanja uređaja licem, uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Osim otključavanja uređaja licem, uređaj možete dodatno zaštititi zahtijevanjem uzorka kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati uzorak za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Osim otključavanja uređaja licem, ovaj uređaj možete zaštititi i zahtijevanjem zaporke prije pokretanja. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim i ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem PIN-a prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem uzorka prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem zaporke prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti zaporku za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničeno"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Prikaži više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Onemogućivanje mobilnog operatera nije uspjelo"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto je pošlo po zlu i onemogućivanje mobilnog operatera nije uspjelo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povezivanje s uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi koristiti privremenu Wi‑Fi mrežu za povezivanje s vašim uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj. Provjerite je li uređaj uključen i dostupan za povezivanje."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3951672..acaec81 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Képernyőzár, arcalapú feloldás"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Képernyőzár, ujjlenyomat"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Képernyőzár"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"A telefon biztonságos feloldása arccal és ujjlenyomattal"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Bejelentkezhet alkalmazásokba és jóváhagyhat fizetéseket is"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Feloldás beállítása a következővel:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Arcalapú feloldás"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"A telefon feloldásának megkönnyítése"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Ujjlenyomat"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Időspórolás a telefon zsebben való feloldásával"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Kihagyás"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tovább"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Arc hozzáadva"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Arcalapú feloldás beállítása"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Arcalapú feloldás"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Nem használhatja ujjlenyomatát azt eszköz feloldására. További információért forduljon szervezete rendszergazdájához."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Az ujjlenyomat kevésbé biztonságos, mint az erős minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Mégse"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nem"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tovább"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kihagyás"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Következő"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Képernyőzárral védett táblagépéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Képernyőzárral védett eszközéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Képernyőzárral védett telefonjához nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Képernyőzárral védett táblagépéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Képernyőzárral védett eszközéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Képernyőzárral védett telefonjához nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Kihagyja a PIN-kód beállítását?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Kihagyja a jelszó beállítását?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Kihagyja a minta beállítását?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Állítsa be a másodlagos képernyőzárat"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Válassza ki a másodlagos képernyőzárolási módszert"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"A képernyőzár feloldása"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"A képernyőzár feloldása"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Képernyő zárolása"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Arcalapú feloldás + jelszó"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Folytatás arcalapú feloldás nélkül"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Feloldhatja telefonját arca segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria és minta"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria és PIN-kód"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria és jelszó"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Folytatás biometriai feloldás nélkül"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Feloldhatja telefonja zárolását biometriai lehetőség használatával. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Csúsztatás"</string>
@@ -912,7 +894,7 @@
     <string name="passpoint_content" msgid="5219226173518418335">"A(z) <xliff:g id="NAME">%1$s</xliff:g> hitelesítési adatai"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP módszer"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Hitelesítés 2. fázisa"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA tanúsítvány"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA-tanúsítvány"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Online tanúsítvány állapota"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Domain"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Felhasználói tanúsítvány"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Az eszköz MAC-címe"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Véletlenszerű MAC-cím"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-cím"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Hálózati információk"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alhálózati maszk"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Írjon be érvényes átjárócímet."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Írjon be érvényes DNS-címet."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 és 32 közti hosszt adjon meg a hálózati előtagnál."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"1. DNS"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"2. DNS"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (hacsak a privát DNS felül nem írja)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (hacsak a privát DNS felül nem írja)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Átjáró"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Hálózati előtag hossza"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1314,7 +1298,7 @@
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Mikor jelenjen meg?"</string>
     <string name="doze_title" msgid="1523090408230862316">"Képernyő ébresztése értesítéskor"</string>
     <string name="doze_summary" msgid="8252867381522942804">"Amikor a képernyő ki van kapcsolva, bekapcsol az új értesítéseknél"</string>
-    <string name="doze_always_on_title" msgid="7326245192352868477">"Időpont és adatok mindig láthatók"</string>
+    <string name="doze_always_on_title" msgid="7326245192352868477">"Idő és adatok mindig láthatók"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Növeli az akkumulátorhasználatot"</string>
     <string name="title_font_size" msgid="570613010306330622">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Szöveg nagyítása és kicsinyítése"</string>
@@ -1625,7 +1609,7 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Beállítások visszaállítása"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Visszaállítható a hálózat, az alkalmazások és az eszköz"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Az Alkalmazások alaphelyzetbe állítható"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, mobiladatok Bluetooth visszaállítása"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"A Wi-Fi, a mobiladatok és a Bluetooth beállításainak visszaállítása"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Az összes hálózati beállítást visszaállítja, például a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladat"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Letöltött SIM-ek törlése"</string>
     <string name="reset_esim_desc" msgid="4256518544336245086">"Csere SIM letöltése érdekében forduljon szolgáltatójához. Ezzel nem szűnik meg egyetlen mobil-előfizetési csomag sem."</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Az arcalapú feloldáshoz adjon meg jelszót"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Az arcalapú feloldáshoz adjon meg mintát"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Az arcalapú feloldáshoz adjon meg PIN-kódot"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometria használatához állítson be jelszót"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometria használatához állítson be mintát"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometria használatához állítson be PIN-kódot"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Elfelejtette jelszavát?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Elfelejtette mintáját?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Elfelejtette PIN-kódját?"</string>
@@ -2938,7 +2919,7 @@
     <string name="vpn_ipsec_identifier" msgid="8511842694369254801">"IPSec-azonosító"</string>
     <string name="vpn_ipsec_secret" msgid="532007567355505963">"Megosztott IPSec-kulcs"</string>
     <string name="vpn_ipsec_user_cert" msgid="2714372103705048405">"IPSec felhasználói tanúsítvány"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"IPSec CA tanúsítvány"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"IPSec CA-tanúsítvány"</string>
     <string name="vpn_ipsec_server_cert" msgid="1411390470454731396">"IPSec-szervertanúsítvány"</string>
     <string name="vpn_show_options" msgid="6105437733943318667">"Speciális beállítások megjelenítése"</string>
     <string name="vpn_search_domains" msgid="1973799969613962440">"DNS-keresési domainek"</string>
@@ -3006,8 +2987,8 @@
     <string name="credential_contains" msgid="407972262032275476">"A bejegyzés a következőket tartalmazza:"</string>
     <string name="one_userkey" msgid="4417212932385103517">"egy felhasználói kulcs"</string>
     <string name="one_usercrt" msgid="1865069301105101370">"egy felhasználói tanúsítvány"</string>
-    <string name="one_cacrt" msgid="7467796501404158399">"egy CA tanúsítvány"</string>
-    <string name="n_cacrts" msgid="5886462550192731627">"%d CA tanúsítvány"</string>
+    <string name="one_cacrt" msgid="7467796501404158399">"egy CA-tanúsítvány"</string>
+    <string name="n_cacrts" msgid="5886462550192731627">"%d CA-tanúsítvány"</string>
     <string name="user_credential_title" msgid="4686178602575567298">"Hitelesítési adatok"</string>
     <string name="user_credential_removed" msgid="4087675887725394743">"A következő hitelesítési adatot törölte a rendszer: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="918620912366836994">"Nincsenek telepített felhasználói hitelesítési adatok"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Még nincs létrehozva – Munkaprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Rendszergazda"</string>
     <string name="user_you" msgid="3070562015202859996">"Ön (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Becenév"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Legfeljebb <xliff:g id="USER_COUNT">%1$d</xliff:g> felhasználót adhat hozzá"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Csak a táblagép tulajdonosa kezelheti a felhasználókat."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Csak a telefon tulajdonosa kezelheti a felhasználókat."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Vissza"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tovább"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Befejezés"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotó készítése"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Kép kiválasztása"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Fotó kiválasztása"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kártyák"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kártyák"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt mintát kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja minta kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz jelszó magadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz PIN-kód megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja a PIN-kód eszközindítás előtti kérését?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz minta megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja minta kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz jelszó megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Igen"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nem"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Korlátozott"</string>
@@ -4583,8 +4557,8 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Megbízható hitelesítési adatok a személyes profilban"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Megbízható hitelesítési adatok a munkaprofilban"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
-      <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA tanúsítvány</item>
-      <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA tanúsítvány</item>
+      <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA-tanúsítvány</item>
+      <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA-tanúsítvány</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"A rendszergazda zárolhatja az eszközt, és új jelszót állíthat be"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"A rendszergazda törölheti az összes adatot az eszközről"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nem hozzáférhető, amikor a következőhöz csatlakozik: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Továbbiak"</string>
     <string name="see_less" msgid="2642392725363552793">"Kevesebb megjelenítése"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kikapcsolja a következőt: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kikapcsolja a SIM-et?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kikapcsolása<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nem sikerült a szolgáltató letiltása"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hiba történt, ezért nem sikerült a szolgáltató letiltása."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Csatlakozás adott eszközhöz"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A(z) <xliff:g id="APPNAME">%1$s</xliff:g> alkalmazás ideiglenes Wi-Fi-hálózatot szeretne használni az eszközhöz való csatlakozáshoz."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nem találhatók eszközök. Ellenőrizze, hogy be vannak-e kapcsolva az eszközök, és lehetséges-e a hozzájuk való csatlakozás."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 3290acf..546001b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -320,7 +320,7 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Էկրանի կողպում, դեմքով ապակողպում"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Էկրանի կողպում, մատնահետք"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Էկրանի կողպում"</string>
-    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Անվտանգ ապակողպեք հեռախոսը դեմքի կամ մատնահետքի օգնությամբ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Անվտանգ ապակողպեք հեռախոսը դեմքի և մատնահետքի օգնությամբ"</string>
     <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Դուք կարող եք նաև մուտք գործել հավելվածներ և հաստատել վճարումները"</string>
     <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ապակողպման եղանակը՝"</string>
     <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Դեմքով ապակողպում"</string>
@@ -438,15 +438,15 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Ավելի ուշ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան։ Կենսաչափական տվյալները կարգավորելու համար ձեզ անհրաժեշտ է նաև էկրանի կողպում։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան։ Կենսաչափական տվյալները կարգավորելու համար ձեզ անհրաժեշտ է նաև էկրանի կողպում։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան։ Կենսաչափական տվյալները կարգավորելու համար ձեզ անհրաժեշտ է նաև էկրանի կողպում։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ, նախշ կամ գաղտնաբառ։"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Պաշտպանեք պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Պաշտպանեք սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Պաշտպանեք հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Բաց թողնե՞լ PIN-ի կարգավորումը"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Բաց թողնե՞լ գաղտնաբառի կարգավորումը"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Բաց թողնե՞լ նախշի կարգավորումը"</string>
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Սարքի MAC հասցե"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Պատահական ընտրված MAC հասցե"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP հասցե"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Ցանցի տվյալներ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Ենթացանցի դիմակ"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Մուտքագրեք վավեր անցախցի հասցե"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Մուքագրեք վավեր DNS հասցե:"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Մուտքագրեք ցանցի նախածանցի երկարությունը` 0-ից 32-ի սահմանում:"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (եթե չի վրագրվել մասնավոր DNS-ի կողմից)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (եթե չի վրագրվել մասնավոր DNS-ի կողմից)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Անցախուց"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ցանցի նախածանցի երկարություն"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1795,9 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Դեմքով ապակողպման համար նշեք գաղտնաբառ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Դեմքով ապակողման համար նշեք նախշ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Դեմքով ապակողպման համար նշեք PIN կոդ"</string>
-    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Կենսաչափական տվյալներն օգտագործելու համար սահմանեք գաղտնաբառ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Կենսաչափական տվյալներն օգտագործելու համար սահմանեք նախշ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Կենսաչափական տվյալներն օգտագործելու համար սահմանեք PIN կոդ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Մոռացել եմ գաղտնաբառը"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Մոռացել եմ նախշը"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Մոռացել եմ PIN-ը"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Կարգավորված չէ - Աշխատանքային պրոֆիլ"</string>
     <string name="user_admin" msgid="4024553191395768119">"Ադմինիստրատոր"</string>
     <string name="user_you" msgid="3070562015202859996">"Դուք (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Կեղծանուն"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Մինչև <xliff:g id="USER_COUNT">%1$d</xliff:g> օգտատիրոջ ավելացում"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Միայն պլանշետի սեփականատերը կարող է կառավարել օգտատերերին:"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Միայն հեռախոսի օգտատերը կարող է կառավարել օգտատերերին:"</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Հետ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Հաջորդը"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Ավարտել"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Լուսանկարել"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Ընտրել պատկեր"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Ընտրեք լուսանկարը"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM քարտեր"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM քարտեր"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Հասանելի չէ <xliff:g id="CARRIER">%1$s</xliff:g>-ին միանալու դեպքում"</string>
     <string name="see_more" msgid="7499355691042812723">"Տեսնել ավելին"</string>
     <string name="see_less" msgid="2642392725363552793">"Տեսնել ավելի քիչ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Անջատե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> օպերատորին"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Անջատե՞լ SIM քարտը"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM քարտն անջատվում է<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Չհաջողվեց անջատել օպերատորին"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Սխալի պատճառով հնարավոր չէ անջատել ձեր օպերատորին։"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Միացում սարքին"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> հավելվածը ցանկանում է օգտագործել ժամանակավոր Wi‑Fi ցանց՝ ձեր սարքին միանալու համար։"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Սարքեր չեն գտնվել։ Համոզվեք, որ սարքերը միացված են և հասանելի են կապակցման համար։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 986de56..1af528c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci layar, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci layar, sidik jari"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kunci layar"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Buka kunci ponsel Anda dengan aman menggunakan wajah dan sidik jari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Anda juga dapat login ke aplikasi dan mengonfirmasi pembayaran"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Siapkan buka kunci dengan:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Membuka kunci ponsel Anda dengan mudah"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sidik jari"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Hemat waktu membuka kunci ponsel di saku Anda"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Lewati"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Berikutnya"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Siapkan face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"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_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan sidik jari untuk membuka kunci ponsel atau menyetujui pembelian.\n\nCatatan: Sidik jari Anda mungkin kurang aman daripada pola atau PIN yang rumit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Lain kali"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Lanjutkan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Lewati"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Berikutnya"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Dengan melindungi tablet dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika tablet hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Dengan melindungi perangkat dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika perangkat hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Dengan melindungi ponsel dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika ponsel hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dengan melindungi tablet menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika tablet hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dengan melindungi perangkat menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika perangkat hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dengan melindungi ponsel menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika ponsel hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Lewati penyiapan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Lewati penyiapan sandi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Lewati penyiapan pola?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Menyiapkan metode kunci layar cadangan"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pilih metode kunci layar cadangan"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opsi kunci layar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opsi kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kunci layar"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + Sandi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Lanjutkan tanpa face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik + Pola"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik + Sandi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Lanjutkan tanpa biometrik"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Anda dapat membuka kunci ponsel menggunakan biometrik. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Geser"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Alamat MAC perangkat"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Alamat MAC yang diacak"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Alamat IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detail jaringan"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ketikkan alamat gerbang yang valid."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ketik alamat DNS yang valid."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ketikkan panjang awalan jaringan antara 0 dan 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (kecuali diganti dengan DNS Pribadi)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (kecuali diganti dengan DNS Pribadi)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Panjang awalan jaringan"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Langsung"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Untuk memakai face unlock, setel sandi"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Untuk memakai face unlock, setel pola"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Untuk memakai face unlock, setel PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Untuk menggunakan biometrik, setel sandi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Untuk menggunakan biometrik, setel pola"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Untuk menggunakan biometrik, setel PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Lupa sandi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Lupa pola?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Lupa PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Tidak disiapkan - Profil kerja"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nama panggilan"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Anda dapat menambahkan maksimal <xliff:g id="USER_COUNT">%1$d</xliff:g> pengguna"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Hanya pemilik tablet yang dapat mengelola pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Hanya pemilik ponsel yang dapat mengelola pengguna."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Kembali"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Berikutnya"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Selesai"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ambil foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pilih gambar"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pilih foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartu SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartu SIM"</string>
@@ -3888,7 +3865,7 @@
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pemasangan pin aplikasi"</string>
     <string name="screen_pinning_description" msgid="6927147836599784578">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan \n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
     <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nJika Anda ingin membagikan perangkat secara aman ke seseorang, coba gunakan pengguna tamu. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan 	\n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
-    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Saat aplikasi dipasangi pin: \n\n•	 Data pribadi dapat diakses \n		(seperti kontak dan konten email) \n•	 Aplikasi yang dipasangi pin dapat membuka aplikasi lain \n\nGunakan pemasangan pin aplikasi hanya untuk orang yang Anda percayai."</string>
+    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Saat aplikasi disematkan: \n\n•	 Data pribadi dapat diakses \n		(seperti kontak dan konten email) \n•	 Aplikasi yang disematkan dapat membuka aplikasi lain \n\nGunakan penyematan aplikasi hanya untuk orang yang Anda percayai."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Minta pola pembuka kunci sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Minta PIN sebelum lepas pin"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Minta sandi sebelum melepas pin"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta PIN untuk mulai mengaktifkan perangkat?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta pola untuk mulai mengaktifkan perangkat?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta sandi untuk mulai mengaktifkan perangkat?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk mengaktifkan perangkat Anda?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta pola untuk mengaktifkan perangkat Anda?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk mengaktifkan perangkat Anda?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Tidak"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Dibatasi"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia saat terhubung ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Lihat lainnya"</string>
     <string name="see_less" msgid="2642392725363552793">"Lihat lebih sedikit"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Nonaktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Nonaktifkan SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Menonaktifkan SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Tidak dapat menonaktifkan operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Terjadi error dan operator Anda tidak dapat dinonaktifkan."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Hubungkan ke perangkat"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikasi <xliff:g id="APPNAME">%1$s</xliff:g> ingin menggunakan jaringan Wi-Fi sementara untuk terhubung ke perangkat"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Perangkat tidak ditemukan. Pastikan perangkat dihidupkan dan dapat tersambung ke jaringan."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 3fc6d67..053cd7b 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjálás, andlitsopnun"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjálás, fingrafar"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skjálás"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Opnaðu símann á öruggan hátt með andliti eða fingrafari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Þú getur líka skráð þig inn í forrit og staðfest greiðslu"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Stilla opnun með:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Andlitsopnun"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Auðveldaðu þér að taka símann úr lás"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingrafar"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Sparaðu tíma - opnaðu símann í vasanum"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Sleppa"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Áfram"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Andliti bætt við"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Setja upp andlitsopnun"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Andlitsopnun"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Þú getur ekki notað fingrafarið til að taka lásinn af þessu tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hætta við"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei, takk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Halda áfram"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Sleppa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Áfram"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ef þú verndar spjaldtölvuna þína með því að velja skjálás getur enginn notað hana ef hún týnist eða ef henni er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ef þú verndar tækið þitt með því að velja skjálás getur enginn notað það ef það týnist eða ef því er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ef þú verndar símann þinn með því að velja skjálás getur enginn notað hann ef hann týnist eða ef honum er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ef þú verndar spjaldtölvuna þína með því að velja skjálás getur enginn notað hana ef hún týnist eða ef henni er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ef þú verndar tækið þitt með því að velja skjálás getur enginn notað það ef það týnist eða ef því er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ef þú verndar símann þinn með því að velja skjálás getur enginn notað hann ef hann týnist eða ef honum er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Viltu sleppa uppsetningu PIN-númers?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Viltu sleppa uppsetningu aðgangsorðs?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Viltu sleppa uppsetningu mynsturs?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Settu upp varaleið fyrir skjálásinn"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Veldu varaleið skjáláss"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Valkostir skjálæsingar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Valkostir skjálæsingar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skjálás"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Andlitsopnun + aðgangsorð"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Halda áfram án andlitsopnunar"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Þú getur tekið símann úr lás með því að nota andlitið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Lífkenni + mynstur"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Lífkenni + PIN-númer"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Lífkenni + aðgangsorð"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Halda áfram án lífkenna"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Þú getur tekið símann úr lás með lífkennum. Af öryggisástæðum krefst þessi valkostur þess að varaskjálás sé til staðar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Enginn"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Strjúka"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-vistfang tækis"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"MAC-vistfang af handahófi"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-tala"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Upplýsingar um net"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Undirnetssía"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sláðu inn gilt vistfang gáttar."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sláðu inn gilt DNS-vistfang."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sláðu inn lengd netforskeytis á bilinu 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nema því sé hnekkt með lokuðu DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nema því sé hnekkt með lokuðu DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gátt"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengd netforskeytis"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Veldu aðgangsorð til að nota andlitsopnun"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Veldu mynstur til að nota andlitsopnun"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Veldu PIN til að nota andlitsopnun"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Stilltu aðgangsorð til að nota lífkenni"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Stilltu mynstur til að nota lífkenni"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Stilltu PIN-númer til að nota lífkenni"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Gleymt aðgangsorð?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Gleymdirðu mynstrinu?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Gleymdirðu PIN-númerinu?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ekki uppsett – vinnusnið"</string>
     <string name="user_admin" msgid="4024553191395768119">"Stjórnandi"</string>
     <string name="user_you" msgid="3070562015202859996">"Þú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Gælunafn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Þú getur bætt við allt að <xliff:g id="USER_COUNT">%1$d</xliff:g> notendum"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Aðeins eigandi spjaldtölvunnar getur haft umsjón með notendum."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Aðeins eigandi símans getur haft umsjón með notendum."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Til baka"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Áfram"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Ljúka"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Taka mynd"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Velja mynd"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Velja mynd"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Til viðbótar við að nota andlitið til að opna tækið geturðu aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig.\n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Til viðbótar við að nota andlitið til að opna tækið geturðu aukið vernd tækisins með því að krefjast mynsturs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig.\n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Auk þess að nota andlitið til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast aðgangsorðsins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, þar til það hefur kveikt á sér.\n\nÞetta bætir gagnavernd á tækjum sem hafa týnst eða þeim verið stolið. Krefjast aðgangsorðs til að ræsa tækið?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast PIN-númersins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast mynstursins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast aðgangsorðsins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Já"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Takmarkað"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ekki í boði þegar tenging við <xliff:g id="CARRIER">%1$s</xliff:g> er til staðar"</string>
     <string name="see_more" msgid="7499355691042812723">"Sjá meira"</string>
     <string name="see_less" msgid="2642392725363552793">"Sjá minna"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Viltu slökkva á <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Slökkva á SIM-korti?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slekkur á SIM-korti<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ekki er hægt að gera símafyrirtæki óvirkt"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Eitthvað fór úrskeiðis og ekki var hægt að gera símafyrirtækið óvirkt."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Tengjast tæki"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Forritið <xliff:g id="APPNAME">%1$s</xliff:g> vill nota tímabundið Wi‑Fi net til að tengjast við tækið þitt"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Engin tæki fundust. Gakktu úr skugga um að kveikt sé á tækjunum og að hægt sé að tengjast við þau."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a7c0d1..8996aa4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocco schermo, Sblocco con il volto"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocco schermo, impronta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blocco schermo"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sblocca il telefono in sicurezza con il volto e l\'impronta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Puoi anche accedere alle app e confermare pagamenti"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura lo sblocco con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Sblocco con il volto"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Sblocca il telefono con facilità"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impronta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Sblocca il telefono in tasca"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Salta"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Avanti"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Volto aggiunto"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Imposta Sblocco con il volto"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Sblocco con il volto"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: non puoi utilizzare la tua impronta per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annulla"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No grazie"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignora"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Avanti"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Se proteggi il tablet con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Se proteggi il dispositivo con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Se proteggi il telefono con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Se proteggi il tablet con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Se proteggi il dispositivo con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Se proteggi il telefono con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Saltare l\'impostazione del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Saltare l\'impostazione della password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Saltare l\'impostazione della sequenza?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Impostare il metodo di blocco schermo dello sfondo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Scegli il metodo di blocco schermo alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opzioni di blocco schermo"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opzioni di blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blocco schermo"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Sblocco con il volto + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continua senza Sblocco con il volto"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puoi sbloccare il telefono usando il tuo volto. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria e sequenza"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria e PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria e password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continua senza biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puoi sbloccare il telefono usando la biometria. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Scorrimento"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Indirizzo MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Indirizzo MAC casuale"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Indirizzo IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Dettagli rete"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digita l\'indirizzo di un gateway valido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digita un indirizzo DNS valido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digita un prefisso di rete di 0-32 caratteri."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a meno che venga sostituito da DNS privato)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a meno che venga sostituito da DNS privato)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lunghezza prefisso rete"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Scegli password per Sblocco con il volto"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Scegli sequenza per Sblocco con il volto"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Scegli PIN per Sblocco con il volto"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Per biometria: imposta password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Per biometria: imposta sequenza"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Per biometria: imposta PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Hai dimenticato la password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Hai dimenticato la sequenza?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Hai dimenticato il PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configurato - Profilo di lavoro"</string>
     <string name="user_admin" msgid="4024553191395768119">"Amministratore"</string>
     <string name="user_you" msgid="3070562015202859996">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puoi aggiungere fino a <xliff:g id="USER_COUNT">%1$d</xliff:g> utenti"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo il proprietario del tablet può gestire gli utenti."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo il proprietario del telefono può gestire gli utenti."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Indietro"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Avanti"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fine"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Scatta una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Scegli un\'immagine"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleziona foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Schede SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Schede SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la password per avviare il dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere la password per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sì"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Con limitazioni"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Altro"</string>
     <string name="see_less" msgid="2642392725363552793">"Comprimi"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vuoi disattivare <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vuoi disattivare la SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Disattivazione SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Impossibile disattivare l\'operatore"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Si è verificato un problema; impossibile disattivare l\'operatore."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connessione al dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'app <xliff:g id="APPNAME">%1$s</xliff:g> vorrebbe usare una rete Wi-Fi temporanea per connettersi al tuo dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nessun dispositivo trovato. Assicurati che i dispositivi siano accesi e disponibili per la connessione."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9527af6..bd34479 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"נעילת מסך, שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"נעילת מסך, טביעת אצבע"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"נעילת מסך"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ביטול נעילת הטלפון באופן מאובטח באמצעות הפנים וטביעת האצבע"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"אפשר גם להיכנס לאפליקציות ולאשר תשלומים"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"הגדרת ביטול נעילה באמצעות:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"שחרור נעילה על ידי זיהוי פנים"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"איך מבטלים את נעילת הטלפון בקלות"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"טביעת אצבע‏"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ביטול נעילה מהיר כשהטלפון מונח בכיס"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"דילוג"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"הבא"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"הפנים נוספו"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"הגדרת שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"שחרור נעילה בזיהוי פנים"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בטביעת אצבע כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: שימוש בטביעת אצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד גישה."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ביטול"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"לא תודה"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"דילוג"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"הבא"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"עם הגדרת הגנה על הטאבלט באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"עם הגדרת הגנה על המכשיר באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"הודות להגנה על הטלפון בנעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"עם הגדרת הגנה על הטאבלט באמצעות אפשרות של נעילת מסך, איש לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"עם הגדרת הגנה על המכשיר באמצעות האפשרות של נעילת המסך, איש לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"עם הגדרת הגנה על הטלפון באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"לדלג על הגדרת קוד הגישה?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"לדלג על הגדרת הסיסמה?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"לדלג על הגדרת קו ביטול הנעילה?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטאבלט הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"הגדר את שיטת הגיבוי לנעילת המסך"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"יש לבחור את שיטת הגיבוי לנעילת המסך"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"אפשרויות לנעילת המסך"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"אפשרויות לנעילת המסך"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"נעילת מסך"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"שחרור נעילה על ידי זיהוי פנים וסיסמה"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"המשך ללא שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ניתן לבטל את נעילת הטלפון באמצעות אימות פנים. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"מידע ביומטרי + קו ביטול נעילה"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"מידע ביומטרי + קוד אימות"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"מידע ביומטרי + סיסמה"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"המשך ללא מידע ביומטרי"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ניתן לבטל את נעילת הטלפון באמצעות המידע הביומטרי שלך. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"הושבת על ידי מדיניות ההצפנה של מנהל המכשיר, או אחסון פרטי כניסה"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"החלקה"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏כתובת MAC של המכשיר"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏כתובת MAC אקראית"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏כתובת IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"פרטי הרשת"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"מסכת רשת משנה"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"הקלד כתובת שער חוקית."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏הקלד כתובת DNS חוקית."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"הקלד אורך לקידומת רשת בין 0 ו-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‏DNS 1 (אלא אם בוטל על ידי שרת DNS פרטי)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‏DNS 2 (אלא אם בוטל על ידי שרת DNS פרטי)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"אורך קידומת של רשת"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏Wi-Fi ישיר"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"צריך סיסמה לשחרור נעילה עם זיהוי פנים"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"צריך קו ביטול נעילה לשחרור עם זיהוי פנים"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"צריך קוד אימות לשחרור על ידי זיהוי פנים"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"לשימוש במידע ביומטרי, יש להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"לשימוש במידע ביומטרי, יש להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"לשימוש במידע ביומטרי יש להגדיר קוד אימות"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"שכחת סיסמה?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"שכחת את קו ביטול הנעילה?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"שכחת את קוד האימות?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"לא מוגדר - פרופיל עבודה"</string>
     <string name="user_admin" msgid="4024553191395768119">"מנהל מערכת"</string>
     <string name="user_you" msgid="3070562015202859996">"את/ה (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"כינוי"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"אפשר להוסיף עד <xliff:g id="USER_COUNT">%1$d</xliff:g> משתמשים"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"הקודם"</string>
     <string name="wizard_next" msgid="3884832431439072471">"הבא"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"סיום"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"צילום תמונה"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"לבחירת תמונה"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"בחירת תמונה"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏כרטיסי SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏כרטיסי SIM"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת קוד גישה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש קוד גישה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת קו ביטול נעילה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש קו ביטול נעילה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת סיסמה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את ההגנה עליו על ידי דרישת קוד אימות לפני ההפעלה. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש קוד אימות כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את ההגנה עליו על ידי דרישת קו ביטול נעילה לפני ההפעלה. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש קו ביטול נעילה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את הגנת המכשיר על ידי דרישת סיסמה לפני הפעלתו. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"כן"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"לא"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"מוגבל"</string>
@@ -4091,7 +4065,7 @@
     <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"שליטה בגישת האפליקציה לנתונים שלך"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"כל האפליקציות"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"אפליקציות מותקנות"</string>
-    <string name="filter_instant_apps" msgid="2292108467020380068">"אפליקציות אינסטנט"</string>
+    <string name="filter_instant_apps" msgid="2292108467020380068">"אפליקציות ללא התקנה"</string>
     <string name="filter_notif_all_apps" msgid="2764590815789208306">"אפליקציות: הכל"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"ההתראות הושבתו"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"קטגוריות: חשיבות דחופה"</string>
@@ -4675,10 +4649,10 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"לא זמין במכשירים הנעולים לספק"</string>
     <string name="oem_lock_info_message" msgid="8843145669619429197">"יש להפעיל מחדש את המכשיר כדי להפעיל את התכונה של הגנת המכשיר."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="706230592123831676">"סה\"כ <xliff:g id="SIZE">%1$s</xliff:g> הפכו לזמינים\n\nהורץ לאחרונה בתאריך <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="6654581786741216382">"אפליקציות אינסטנט"</string>
+    <string name="web_action_enable_title" msgid="6654581786741216382">"אפליקציות ללא התקנה"</string>
     <string name="web_action_enable_summary" msgid="2658930257777545990">"פתיחת קישורים באפליקציות, גם אם הן לא מותקנות"</string>
-    <string name="web_action_section_title" msgid="994717569424234098">"אפליקציות אינסטנט"</string>
-    <string name="instant_apps_settings" msgid="4280942494969957858">"העדפות של אפליקציות אינסטנט"</string>
+    <string name="web_action_section_title" msgid="994717569424234098">"אפליקציות ללא התקנה"</string>
+    <string name="instant_apps_settings" msgid="4280942494969957858">"העדפות של אפליקציות ללא התקנה"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4807,7 +4781,7 @@
     <string name="storage_manager_indicator" msgid="6187509172735927297">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="2705959642617709265">"כבוי"</string>
     <string name="storage_manager_indicator_on" msgid="8380330763647785309">"פועל"</string>
-    <string name="install_type_instant" msgid="7685381859060486009">"אפליקציה אינסטנט"</string>
+    <string name="install_type_instant" msgid="7685381859060486009">"אפליקציה ללא התקנה"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"האם לכבות את מנהל האחסון?"</string>
     <string name="storage_movies_tv" msgid="7897612625450668593">"אפליקציות סרטים וטלוויזיה"</string>
     <string name="carrier_provisioning" msgid="7217868336140325816">"פרטי ניהול תצורה של ספק סלולרי"</string>
@@ -4857,7 +4831,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"‏מאפשר לאפליקציה לשלוט ב-Wi-Fi"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"‏מאפשר לאפליקציה זו להפעיל ולכבות חיבור Wi-Fi, לסרוק רשתות Wi-Fi ולהתחבר אליהן, להוסיף ולהסיר רשתות או להתחיל נקודה לשיתוף אינטרנט מקומית בלבד"</string>
     <string name="media_output_title" msgid="8283629315159510680">"הפעלת מדיה באמצעות"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"הפעלת <xliff:g id="LABEL">%s</xliff:g> ב-"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"הפעלת <xliff:g id="LABEL">%s</xliff:g> ב:"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"מכשיר זה"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"טלפון"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"טאבלט"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"לא זמין כשהמכשיר מחובר ל-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"הצגת פריטים נוספים"</string>
     <string name="see_less" msgid="2642392725363552793">"הצג פחות"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"לכבות את <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏לכבות את כרטיס ה-SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏מתבצע כיבוי של כרטיס ה-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"לא ניתן להשבית את הספק"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"משהו השתבש ולא ניתן היה להשבית את הספק."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"התחברות למכשיר"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏האפליקציה <xliff:g id="APPNAME">%1$s</xliff:g> מבקשת להשתמש ברשת Wi-Fi זמנית כדי להתחבר למכשיר שלך"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"לא נמצאו מכשירים. יש לוודא שהמכשירים פועלים וזמינים לחיבור."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5a3da08..1df858f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"画面ロック、顔認証"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"画面ロック、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"画面ロック"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"顔認証と指紋認証でスマートフォンを安全にロック解除できます"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"アプリへのログイン、お支払いの承認もできます"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ロック解除方法を設定:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"顔認証"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"スマートフォンのロック解除が簡単になります"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ポケットの中でスマートフォンのロックをすぐに解除できます"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"スキップ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"次へ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"顔を追加済みです"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"顔認証を設定します"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"顔認証"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"キャンセル"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"利用しない"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"スキップ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"次へ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"画面ロックでタブレットを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"画面ロックでデバイスを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"画面ロックでスマートフォンを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"画面ロックでタブレットを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"画面ロックでデバイスを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"画面ロックでスマートフォンを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN の設定をスキップしますか？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"パスワードの設定をスキップしますか？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"パターンの設定をスキップしますか？"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"このタブレットが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"このデバイスが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"このスマートフォンが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"予備の画面ロック方式を設定"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"予備の画面ロック方式を選択してください"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"画面ロックの方法"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"画面ロックの方法"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"画面ロック"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"顔認証 + パスワード"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"顔認証を設定せずに続行"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"顔認証を使用してスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生体認証システム + パターン"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生体認証システム + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生体認証システム + パスワード"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"生体認証システムを設定せずに続行"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"生体認証システムを使ってスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する場合は予備の画面ロック方式を選択する必要があります。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"管理者、暗号化ポリシー、または認証情報ストレージにより無効化"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"スワイプ"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"デバイスの MAC アドレス"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ランダム MAC アドレス"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP アドレス"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ネットワークの詳細"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"サブネット マスク"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"有効なゲートウェイアドレスを入力してください。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"有効なDNSアドレスを入力してください。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"ネットワークプレフィックス長は0～32で指定します。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1（プライベート DNS でオーバーライドされる場合を除く）"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2（プライベート DNS でオーバーライドされる場合を除く）"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ゲートウェイ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ネットワークプレフィックス長"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"顔認証のバックアップの設定"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"顔認証のバックアップの設定"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"顔認証のバックアップの設定"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"生体認証システムの使用には、パスワード設定が必要です"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"生体認証システムの使用には、パターン設定が必要です"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"生体認証システムの使用には、PIN 設定が必要です"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"パスワードを忘れた場合"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"パターンを忘れた場合"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN を忘れた場合"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"セットアップしていません - 仕事用プロファイル"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理者"</string>
     <string name="user_you" msgid="3070562015202859996">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ニックネーム"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"最大<xliff:g id="USER_COUNT">%1$d</xliff:g>人のユーザーを追加できます"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ユーザーを管理できるのはタブレットの所有者のみです。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ユーザーを管理できるのはモバイルデバイスの所有者のみです。"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"戻る"</string>
     <string name="wizard_next" msgid="3884832431439072471">"次へ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"終了"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"写真を撮る"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"画像を選択"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"写真を選択"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIMカード"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIMカード"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"デバイスのロック解除に顔認証を使うだけでなく、起動時に PIN を入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動に PIN を必要としますか？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"デバイスのロック解除に顔認証を使うだけでなく、起動時にパターンを入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動にパターンを必要としますか？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"デバイスのロック解除に顔認証を使うだけでなく、起動時にパスワードを入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動にパスワードを必要としますか？"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"デバイスのロック解除に生体認証システムを使うだけでなく、デバイスの起動前の PIN 入力を必須すると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時に PIN の入力を要求するように設定しますか？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"デバイスのロック解除に生体認証システムを使用するだけでなく、デバイスの起動前のパターン入力を必須にすると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時にパターンの入力を要求するように設定しますか？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"デバイスのロック解除時に生体認証システムを使用するだけでなく、デバイス起動前のパスワード入力を必須にすると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時にパスワードの入力を要求するように設定しますか？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"はい"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"いいえ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"制限"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> への接続時は利用できません"</string>
     <string name="see_more" msgid="7499355691042812723">"詳細"</string>
     <string name="see_less" msgid="2642392725363552793">"一部を表示"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> を OFF にしますか？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM を OFF にしますか？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM を OFF にしています<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"携帯通信会社の無効化エラー"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"エラーが発生したため、携帯通信会社を無効にできませんでした。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"デバイスに接続"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> アプリがデバイスに接続するために、Wi-Fi ネットワークを一時的に使用します"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"デバイスが見つかりません。デバイスの電源が入っており、接続が可能であることを確認してください。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 9e64b28..2cdafd0 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ეკრანის დაბლოკვა, განბლოკვა სახით"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ეკრანის დაბლოკვა, თითის ანაბეჭდი"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ეკრანის დაბლოკვა"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"უსაფრთხოდ განბლოკეთ ტელეფონი თქვენი სახით და თითის ანაბეჭდით"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"თქვენ ასევე შეგიძლიათ აპებში შესვლა და გადახდის დადასტურება"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"განბლოკვის შემდეგით დაყენება:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"სახით განბლოკვა"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"გახადეთ ტელეფონის განბლოკვა სუნთქვასავით მარტივი"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"თითის ანაბეჭდი"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"დაზოგეთ დრო ტელეფონის ჯიბეშივე განბლოკვით"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"გამოტოვება"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"შემდეგ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"სახე დამატებულია"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"სახით განბლოკვის დაყენება"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"განბლოკვა სახით"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდს ამ მოწყობილობის განსაბლოკად ვერ გამოიყენებთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მძლავრი განმბლოკავი ნიმუში ან PIN-კოდი."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"გაუქმება"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"არა, გმადლობთ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"გაგრძელება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"გამოტოვება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"შემდეგი"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"თქვენი ტაბლეტის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"თქვენი მოწყობილობის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"თქვენი ტელეფონის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"თქვენი ტაბლეტის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"თქვენი მოწყობილობის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"თქვენი ტელეფონის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"გამოტოვებთ PIN-კოდის დაყენებას?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"გამოტოვებთ პაროლის დაყენებას?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"გამოტოვებთ ნიმუშის დაყენებას?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტაბლეტი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდის დაყენება"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"აირჩიეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ეკრანის დაბლოკვის ვარიანტები"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ეკრანის დაბლოკვის ვარიანტები"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ეკრანის დაბლოკვა"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"განბლოკვა სახით + პაროლი"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"გაგრძელება სახით განბლოკვის გარეშე"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"თქვენი ტელეფონის განბლოკვას შეძლებთ სახის მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ბიომეტრიული მონაცემები + განმბლოკავი ნიმუში"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ბიომეტრიული მონაცემები + PIN-კოდი"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ბიომეტრიული მონაცემები + პაროლი"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ბიომეტრიული მონაცემების გარეშე გაგრძელება"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"თქვენი ტელეფონის განბლოკვას შეძლებთ ბიომეტრიული მონაცემების მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"გათიშულია ადმინისტრატორის მიერ დაშიფვრის წესების ან სამომხმარებლო მონაცემების საცავის გამო"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"არც ერთი"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"გასრიალება"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"მოწყობილობის MAC მისამართი"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"შემთხვევითი MAC მისამართი"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP მისამართი"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ქსელის დეტალები"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ქვექსელის ნიღაბი"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"შეიყვანეთ გეითვეის სწორი მისამართი."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"შეიყვანეთ სწორი DNS მისამართი."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"შეიყვანეთ ქსელის პრეფიქსი, რომლის სიგრძეა 0-დან 32-მდე."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (სანამ არ არის უგულებელყოფილი პირადი DNS-ის მიერ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (სანამ არ არის უგულებელყოფილი პირადი DNS-ის მიერ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"გეითვეი"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ქსელის პრეფიქსის სიგრძე"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1227,7 +1211,7 @@
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ავტომატურად ზრდის განახლების სიხშირეს 60-დან და 90 ჰც-მდე გარკვეული კონტენტისთვის. გაზრდის ბატარეის მოხმარებას."</string>
     <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"იძულებითი 90 ჰც განახლების სიხშირე"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"განახლების უმაღლესი სიხშირე შეხებაზე გაუმჯობესებული რეაგირებისთვის და უფრო ერთგვაროვანი ანიმაციისთვის. გაზრდის ბატარეის მოხმარებას."</string>
-    <string name="adaptive_sleep_title" msgid="2987961991423539233">"ეკრანისკენ მიმართული ყურადღება"</string>
+    <string name="adaptive_sleep_title" msgid="2987961991423539233">"ეკრანზე ყურადღება"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ჩართულია / ეკრანი არ გამოირთვება, თუ მას უყურებთ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"გამორთულია"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"საჭიროა კამერაზე წვდომა"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"სახით განბლოკვისთვის დააყენეთ პაროლი"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"სახით განბლოკვისთვის დააყენეთ ნიმუში"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"სახით განბლოკვისთვის დააყენეთ PIN-კოდი"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ბიომეტრიული მონაცემების გამოსაყენებლად პაროლი უნდა დააყენოთ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ბიომეტრიული მონაცემების გამოსაყენებლად განმბლოკავი ნიმუში უნდა დააყენოთ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ბიომეტრიული მონაცემების გამოსაყენებლად PIN-კოდი უნდა დააყენოთ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"პაროლი დაგავიწყდათ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"დაგავიწყდათ ნიმუში?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"დაგავიწყდათ PIN-კოდი?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"არ არის დაყენებული - სამუშაო პროფილი"</string>
     <string name="user_admin" msgid="4024553191395768119">"ადმინისტრატორი"</string>
     <string name="user_you" msgid="3070562015202859996">"თქვენ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"მეტსახელი"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"შეგიძლიათ დაამატოთ <xliff:g id="USER_COUNT">%1$d</xliff:g>-მდე მომხმარებელი"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"მომხმარებლების მართვა შეუძლია მხოლოდ ტაბლეტის მფლობელს."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"მომხმარებლების მართვა შეუძლია მხოლოდ ტელეფონის მფლობელს."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"უკან"</string>
     <string name="wizard_next" msgid="3884832431439072471">"მომდევნო"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"დასრულება"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ფოტოს გადაღება"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"სურათის არჩევა"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ფოტოს არჩევა"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ბარათები"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ბარათები"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს ნიმუშის დახატვა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს ნიმუშის დახატვა?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს პაროლის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს პაროლის შეყვანა?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"განსაბლოკად თქვენი ბიომეტრიული მონაცემების ერთად, დამატებითი უსაფრთხოებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"განსაბლოკად თქვენი ბიომეტრიული მონაცემების გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად განმბლოკავი ნიმუშის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. მოხდეს განმბლოკავი ნუმუშის შეყვანის მოთხოვნა თქვენი მოწყობილობის გასაშვებად?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"განსაბლოკად ბიომეტრიული მონაცემების გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. მოხდეს პაროლის შეყვანის მოთხოვნა თქვენი მოწყობილობის გასაშვებად?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"დიახ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"არა"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"შეზღუდული"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"მიუწვდომელია, როცა დაკავშირებულია <xliff:g id="CARRIER">%1$s</xliff:g>-თან"</string>
     <string name="see_more" msgid="7499355691042812723">"მეტის ნახვა"</string>
     <string name="see_less" msgid="2642392725363552793">"ნაკლების ნახვა"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"გამოირთოს <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"გამოირთოს SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"მიმდინარეობს SIM-ის გამორთვა<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ოპერატორი ვერ გაითიშა"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ოპერატორი ვერ გაითიშა წარმოქმნილი შეფერხების გამო."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"მოწყობილობასთან დაკავშირება"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> აპს სურს დროებითი Wi-Fi ქსელის გამოყენება თქვენს მოწყობილობასთან დასაკავშირებლად"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"მოწყობილობები ვერ მოიძებნა. დარწმუნდით, რომ მოწყობილობები ჩართულია და ხელმისაწვდომია დასაკავშირებლად."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index fc32cf6..b7d1f13 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды құлыптау, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды құлыптау, саусақ ізі"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Экранды құлыптау"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Телефоныңыздың құлпын бет және саусақ ізі арқылы ашыңыз"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Қолданбаларға кіріп, төлеміңізді растауыңызға болады"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Құлыпты ашу әдісі:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Телефоныңыздың құлпын оңай ашыңыз"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Саусақ ізі"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Телефонның құлпын саусақ ізімен ашыңыз"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Өткізіп жіберу"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Келесі"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Бет енгізілді"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Face Unlock функциясын реттеу"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын саусақ ізімен ашу мүмкін емес. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: қауіпсіздік тұрғысынан саусақ ізі күрделі өрнекке не PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Бас тарту"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жоқ, рақмет"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Жалғастыру"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткізіп жіберу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Келесі"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN коды реттелмесін бе?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Құпия сөз реттелмесін бе?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Өрнек реттелмесін бе?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"құрылғы қорғау мүмкіндіктерін іске қосу арқылы сіздің рұқсатыңызсыз планшетті басқалардың пайдалануына жол бермеңіз. Пайдаланғыңыз келетін экран құлпын таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Сақтық көшірме экранын құлыптау әдісін орнату"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Қосымша экран құлпы әдісін таңдаңыз"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Экран құлпы опциялары"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Экран құлпы опциялары"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Экран құлпы"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + құпия сөз"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Face Unlock функциясынсыз жалғастыру"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Телефонның құлпын бетті тану функциясымен ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + Өрнек"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN коды"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + Құпия сөз"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометрикасыз жалғастыру"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Телефоныңыздың құлпын биометрика арқылы ашуыңызға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Әкімші, шифрлау саясаты немесе тіркелкі деректерінің жады өшірген"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ешқандай"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сырғыту"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Құрылғының MAC мекенжайы"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Кездейсоқ MAC мекенжайы"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP мекенжайы"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Желі деректері"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Қосалқы желі маскасы"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Жарамды торап мекенжайын теріңіз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Жарамды DNS мекенжайын теріңіз."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Желі префиксінің ұзындығын 0 және 32 аралығында теріңіз"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (жеке DNS-пен ауыстырылмаса)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (жеке DNS-пен ауыстырылмаса)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Торап"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Желі префиксінің ұзындығы"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Face Unlock функциясын пайдалану үшін құпия сөз орнатыңыз"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Face Unlock қолдану үшін өрнек орнатыңыз"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Face Unlock функциясын пайдалану үшін PIN кодын орнатыңыз"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Құпия сөз орнатып, биомерика қолданыңыз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Өрнек орнатып, биометрика қолданыңыз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"PIN кодын орнатып, биометрика қолданыңыз"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Құпия сөзді ұмытып қалдыңыз ба?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Өрнекті қалдыңыз ба?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN кодын ұмытып қалдыңыз ба?"</string>
@@ -2692,7 +2673,7 @@
     <string name="tts_sliders_title" msgid="6901146958648426181">"Сөйлеу жылдамдығы және екпін"</string>
     <string name="tts_engine_section_title" msgid="5115035218089228451">"Жүйе"</string>
     <string name="tts_install_voice_title" msgid="5133545696447933812">"Дауыс"</string>
-    <string name="tts_spoken_language" msgid="4652894245474520872">"Сөйлесу тілі"</string>
+    <string name="tts_spoken_language" msgid="4652894245474520872">"Дыбысталу тілі"</string>
     <string name="tts_install_voices_title" msgid="6505257816336165782">"Дауыстарды орнату"</string>
     <string name="tts_install_voices_text" msgid="902408506519246362">"Дауыстарды орнату үшін <xliff:g id="TTS_APP_NAME">%s</xliff:g> қолданбасына өту"</string>
     <string name="tts_install_voices_open" msgid="919034855418197668">"Қолданбаны ашу"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Орнатылмаған – жұмыс профилі"</string>
     <string name="user_admin" msgid="4024553191395768119">"Әкімші"</string>
     <string name="user_you" msgid="3070562015202859996">"Сіз (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Қысқа аты"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> пайдаланушыға дейін қоса аласыз"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Планшет иесі ғана пайдаланушыларды басқара алады."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Телефон иесі ғана пайдаланушыларды басқара алады."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Артқа"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Келесі"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Аяқтау"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Суретке түсіру"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Кескін таңдау"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Фотосурет таңдау"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карталары"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карталары"</string>
@@ -3486,7 +3463,7 @@
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Бейімделетін хабарландырулар басымдығы"</string>
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маңыздылығы төмен хабарландыруларды автоматты түрде дыбыссыз режимге орнату"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Хабарландыруларды автоматты түрде сұрыптау"</string>
-    <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды қатыстылығына қарай сұрыптау"</string>
+    <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды сәйкестігіне қарай сұрыптау"</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Бейімделетін хабарландырулар туралы пікірлер"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Хабарландыруларға жасалған түзетулерді көрсетеді және жүйеге пікір жіберуді ұсынады"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында PIN кодын енгізу сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, PIN кодын енгізу сұралсын ба?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында өрнек сызу сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, өрнекті сызу сұралсын ба?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында құпия сөз сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, құпия сөз сұралсын ба?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында терілетін PIN коды арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыны қосу үшін PIN коды сұралсын ба?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында сызылатын өрнек арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыны қосу үшін өрнек сызу сұралсын ба?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында терілетін құпия сөз арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыңызды қосу үшін құпия сөз сұралсын ба?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Иә"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Жоқ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Шектелген"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторына қосылып тұрғанда қолжетімді емес"</string>
     <string name="see_more" msgid="7499355691042812723">"Басқаларын көру"</string>
     <string name="see_less" msgid="2642392725363552793">"Азырақ көру"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өшірілсін бе?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM картасы өшірілсін бе?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картасы өшірілуде<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Оператор өшірілмеді"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бірдеңеден қате кетті де, оператор өшірілмеді."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Құрылғыға қосылу"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> қолданбасы құрылғыңызға қосылу үшін уақытша Wi‑Fi желісін пайдаланғысы келеді."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ешбір құрылғы табылмады. Құрылғылардың қосулы екенін, оларды жалғауға болатынын тексеріңіз."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3bf7eda..1aa0996 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ការចាក់សោអេក្រង់ ការដោះសោតាមទម្រង់មុខ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ការចាក់សោអេក្រង់ ស្នាមម្រាមដៃ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ការចាក់សោអេក្រង់"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ដោះសោទូរសព្ទរបស់អ្នកដោយសុវត្ថិភាព ដោយប្រើមុខ និងស្នាមម្រាមដៃរបស់អ្នក"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"អ្នកក៏អាច​ចូលកម្មវិធី ដើម្បីបញ្ជាក់​ការបង់ប្រាក់​បានផងដែរ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"រៀបចំ​ការដោះសោ​ដោយប្រើ៖"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ដោះសោ​តាមទម្រង់មុខ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ធ្វើឱ្យងាយស្រួលដោះសោទូរសព្ទរបស់អ្នកបំផុត"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ស្នាម​ម្រាមដៃ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ចំណេញពេលដោយដោះសោទូរសព្ទក្នុងហោប៉ៅ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"រំលង"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"បន្ទាប់"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"បាន​បញ្ចូល​មុខ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"រៀបចំ​ការដោះសោ​តាម​ទម្រង់​មុខ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ការដោះសោ​តាមទម្រង់មុខ"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រង​របស់​ស្ថាប័នអ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលរឹងមាំនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"បោះបង់"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ទេ អរគុណ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"បន្ត"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"រំលង"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"បន្ទាប់"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"តាមរយៈ​ការការពារ​ថេប្លេត​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើថេប្លេត​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"តាមរយៈ​ការការពារ​ឧបករណ៍​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើ​ឧបករណ៍​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"តាមរយៈ​ការការពារ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើទូរសព្ទ​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"តាមរយៈ​ការការពារ​ថេប្លេត​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើថេប្លេត​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"តាមរយៈ​ការការពារ​ឧបករណ៍​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើ​ឧបករណ៍​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"តាមរយៈ​ការការពារ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើទូរសព្ទ​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"រំលងការ​រៀបចំកូដ PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"រំលង​ការរៀបចំ​ពាក្យសម្ងាត់?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"រំលង​ការរៀបចំ​លំនាំ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើថេប្លេតនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ដំឡើងវិធីសាស្ត្រចាក់សោអេក្រង់បម្រុងរបស់អ្នក"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ជ្រើសរើស​វិធីចាក់សោ​អេក្រង់បម្រុង​របស់អ្នក"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ជម្រើស​ចាក់សោអេក្រង់"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ជម្រើស​ចាក់សោអេក្រង់"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ចាក់សោ​អេក្រង់"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ការដោះសោ​តាមទម្រង់មុខ + ពាក្យសម្ងាត់"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"បន្ត​ដោយមិនរៀបចំ​ការដោះសោតាមទម្រង់មុខ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើមុខរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឱ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ជីវមាត្រ + លំនាំ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ជីវមាត្រ + កូដ PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ជីវមាត្រ + ពាក្យ​សម្ងាត់"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"បន្តដោយ​មិនប្រើ​ជីវមាត្រ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"អ្នកអាច​ដោះសោ​ទូរសព្ទរបស់អ្នក​ដោយប្រើ​ជីវមាត្រ​របស់អ្នក។ ដើម្បី​សុវត្ថិភាព ជម្រើសនេះ​តម្រូវឱ្យមាន​ការចាក់សោអេក្រង់​បម្រុង។"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"បិទដោយអ្នកគ្រប់គ្រង គោលការណ៍​អ៊ិនគ្រីប ឬទំហំផ្ទុកព័ត៌មានសម្គាល់ខ្លួន"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"គ្មាន"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"អូស"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"អាសយដ្ឋាន​ឧបករណ៍ MAC"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"អាសយដ្ឋាន MAC ចៃដន្យ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ព័ត៌មាន​បណ្ដាញ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"របាំងបណ្តាញរង"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"បញ្ចូល​ប្រវែង​បុព្វបទ​បណ្ដាញ​ចន្លោះ ០ និង ៣២។"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ប្រសិនបើមិនលុបពីលើដោយ DNS ឯកជន)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ប្រសិនបើមិនលុបពីលើដោយ DNS ឯកជន)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ច្រក​"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ប្រវែង​បុព្វបទ​បណ្ដាញ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi ​ផ្ទាល់"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​លំនាំ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​កូដ PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ដើម្បីប្រើជីវមាត្រ សូមកំណត់ពាក្យសម្ងាត់"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ដើម្បីប្រើ​ជីវមាត្រ សូមកំណត់​លំនាំ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ដើម្បីប្រើ​ជីវមាត្រ សូមកំណត់​កូដ PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ភ្លេចពាក្យសម្ងាត់​របស់អ្នកឬ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ភ្លេចលំនាំ​របស់អ្នកឬ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ភ្លេចកូដ PIN របស់អ្នកឬ?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"មិន​បាន​រៀបចំ - ប្រវត្តិរូប​ការងារ"</string>
     <string name="user_admin" msgid="4024553191395768119">"អ្នកគ្រប់គ្រង"</string>
     <string name="user_you" msgid="3070562015202859996">"អ្នក (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"សម្មតិនាម"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"អ្នកអាចបន្ថែមអ្នកប្រើរហូតដល់ <xliff:g id="USER_COUNT">%1$d</xliff:g> នាក់"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"មាន​តែ​ម្ចាស់​កុំព្យូទ័រ​បន្ទះ​ប៉ុណ្ណោះ​អាច​គ្រប់គ្រង​អ្នកប្រើ"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"មាន​តែ​ម្ចាស់​ទូរស័ព្ទ​ប៉ុណ្ណោះ​អាច​គ្រប់គ្រង​អ្នកប្រើ។"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ថយក្រោយ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"បន្ទាប់​"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"បញ្ចប់"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ថតរូប"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ជ្រើសរើស​រូបភាព"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ជ្រើស​រូបថត"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ស៊ី​ម​កាត"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ស៊ី​ម​កាត"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់​អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលកូដ PIN ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​​ឱ្យ​​បញ្ចូលកូដ PIN ​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលលំនាំ ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​ឱ្យ​​បញ្ចូលលំនាំ ​ដើម្បី​​ចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលពាក្យ​សម្ងាត់ ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​ឱ្យ​​បញ្ចូលពាក្យ​សម្ងាត់ ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បី​ដោះសោឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយ​តម្រូវឱ្យប្រើកូដ PIN របស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​កូដ PIN ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បី​ដោះសោឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយ​តម្រូវឱ្យប្រើ​លំនាំរបស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​លំនាំ ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បីដោះសោ​ឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវឱ្យ​ប្រើពាក្យសម្ងាត់​របស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​ពាក្យសម្ងាត់ ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"បាទ/ចាស"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ទេ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"បាន​ដាក់​កំហិត"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"មិន​អាច​ប្រើបាន​ទេ នៅពេលភ្ជាប់ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"មើលច្រើន​ទៀត"</string>
     <string name="see_less" msgid="2642392725363552793">"​មើល​តិច​ជាង"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"បិទ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"បិទ​ស៊ីម​ឬ​?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"កំពុង​បិទស៊ីម<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"មិនអាច​បិទក្រុមហ៊ុន​សេវាទូរសព្ទ​បានទេ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"មានអ្វីមួយ​ខុស​ប្រក្រតី ទើបមិនអាចបិទ​ក្រុមហ៊ុន​សេវាទូរសព្ទ​របស់អ្នកបាន។"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ភ្ជាប់​ឧបករណ៍"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"កម្មវិធី <xliff:g id="APPNAME">%1$s</xliff:g> ចង់ប្រើ​បណ្ដាញ Wi‑Fi បណ្ដោះអាសន្ន ដើម្បីភ្ជាប់ជាមួយ​ឧបករណ៍​របស់អ្នក"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"រកមិន​ឃើញ​ឧបករណ៍ទេ។ សូម​ប្រាកដថា​ឧបករណ៍​បានបើក និងអាច​ភ្ជាប់បាន។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 50bca10..c6e0f25 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ಪರದೆ ಲಾಕ್"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ನಿಮ್ಮ ಮುಖ ಮತ್ತು ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಮೂಲಕ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ ಕೂಡ ಪಾವತಿಯನ್ನು ಖಚಿತಪಡಿಸಬಹುದು"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ಇದರೊಂದಿಗೆ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡುವುದಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ನಿಮ್ಮ ಜೇಬಿನಲ್ಲಿ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಮೂಲಕ ಸಮಯವನ್ನು ಉಳಿಸಿ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ಮುಂದಿನದು"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ಮುಖ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಸಮರ್ಥ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ರದ್ದುಮಾಡಿ"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ಮುಂದುವರಿಸು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ಸ್ಕಿಪ್‌"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ಮುಂದೆ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ಪಿನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡಬೇಕೇ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ಪಾಸ್‌ವರ್ಡ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ಪ್ಯಾಟರ್ನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಯಿರಿ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪ್ಯಾಟರ್ನ್"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪಿನ್"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಯಿರಿ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಸುರಕ್ಷತೆಯ ದೃಷ್ಟಿಯಿಂದ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ಅಡ್ಮಿನ್, ಎನ್‍ಕ್ರಿಪ್ಷನ್, ರುಜುವಾತಿನಿಂದಾಗಿ ನಿಷ್ಕ್ರಿಯ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ಸ್ವೈಪ್"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ಸಾಧನದ MAC ವಿಳಾಸ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ಯಾದೃಚ್ಛಿಕಗೊಳಿಸಿದ MAC ವಿಳಾಸ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ವಿಳಾಸ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ನೆಟ್‌ವರ್ಕ್‌ ವಿವರಗಳು"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ಮಾನ್ಯವಾದ ಗೇಟ್‌ವೇ ವಿಳಾಸವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ಮಾನ್ಯವಾದ DNS ವಿಳಾಸವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ಮತ್ತು 32 ನಡುವಿನ ಉದ್ದದ ನೆಟ್‌ವರ್ಕ್‌ ಪೂರ್ವಪ್ರತ್ಯಯವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ಖಾಸಗಿ DNS‌ ನಿಂದ ಅತಿಕ್ರಮಿಸದಿದ್ದರೆ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ಖಾಸಗಿ DNS‌ ನಿಂದ ಅತಿಕ್ರಮಿಸದಿದ್ದರೆ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ಗೇಟ್‌ವೇ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ನೆಟ್‌ವರ್ಕ್‌ ಪೂರ್ವಪ್ರತ್ಯಯದ ಅಳತೆ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi ಡೈರೆಕ್ಟ್"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಲು ಪಿನ್ ಹೊಂದಿಸಿ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪಿನ್‌‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರೆತುಹೋಗಿರುವಿರಾ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಮರೆತಿದ್ದೀರಾ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರೆತಿದ್ದೀರಾ?"</string>
@@ -1991,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"ನೀವು ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, Android ಮತ್ತು ಇತರ ಆ್ಯಪ್‌ಗಳು ಇನ್ನು ಮುಂದೆ ಉದ್ದೇಶಿಸಿದ ಹಾಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು. ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪೂರ್ವ-ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿರುವುದರಿಂದ, ನೀವು ಅದನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಆ್ಯಪ್ ಅನ್ನು ನೀವು ಆಫ್ ಮಾಡಬಹುದು ಮತ್ತು ಅದನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮರೆ ಮಾಡಬಹುದು."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್‌ ಮಾಡುವುದೇ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ಅಂಗಡಿ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"ಸ್ಟೋರ್"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಲ್ಲಿ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ಹೊಂದಿಸಿಲ್ಲ - ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_admin" msgid="4024553191395768119">"ನಿರ್ವಾಹಕ"</string>
     <string name="user_you" msgid="3070562015202859996">"ನೀವು (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ಅಡ್ಡಹೆಸರು"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ನೀವು <xliff:g id="USER_COUNT">%1$d</xliff:g> ರವರೆಗೆ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಬಹುದು"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ಕೇವಲ ಟ್ಯಾಬ್ಲೆಟ್‌ಗಳ ಮಾಲೀಕರು ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ಕೇವಲ ಫೋನ್‌ಗಳ ಮಾಲೀಕರು ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಬಹುದು."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ಹಿಂದೆ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ಮುಂದೆ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ಪೂರ್ಣಗೊಳಿಸು"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ಫೋಟೋವನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ಚಿತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್‌‌ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ಹೌದು"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ಇಲ್ಲ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
     <string name="see_more" msgid="7499355691042812723">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
     <string name="see_less" msgid="2642392725363552793">"ಕಡಿಮೆ ನೋಡಿ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ವಾಹಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ಏನೋ ತಪ್ಪಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ತಾತ್ಕಾಲಿಕ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್ ಅನ್ನು ಬಳಸಲು <xliff:g id="APPNAME">%1$s</xliff:g> ಆ್ಯಪ್ ಬಯಸುತ್ತದೆ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ಯಾವುದೇ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ. ಸಾಧನಗಳನ್ನು ಆನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಸಂಪರ್ಕಿಸಲು ಲಭ್ಯವಿದೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3cabcfc..0779f8a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"화면 잠금, 얼굴인식 잠금해제"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"화면 잠금, 지문"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"화면 잠금"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"얼굴과 지문으로 안전하게 휴대전화를 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"앱에 로그인하여 결제를 확인하는 방법도 있습니다."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"설정할 잠금 해제 수단:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"얼굴인식 잠금해제"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"더욱 간편하게 휴대전화를 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"지문"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"주머니에서 휴대전화를 바로 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"건너뛰기"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"다음"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"얼굴 추가 완료"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"얼굴인식 잠금해제 설정"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"얼굴인식 잠금해제"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 지문을 사용하여 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"취소"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"계속"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"건너뛰기"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"다음"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"태블릿을 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"기기를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"휴대전화를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"태블릿을 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"기기를 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"휴대전화를 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"비밀번호 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"패턴 설정을 건너뛰시겠습니까?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 태블릿을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"백업 화면 잠금 방식을 설정하세요."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"백업 화면 잠금 방식 선택"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"화면 잠금 옵션"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"화면 잠금 옵션"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"화면 잠금"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"얼굴인식 잠금해제 + 비밀번호"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"얼굴인식 잠금해제 없이 계속하기"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"얼굴을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"생체 인식 + 패턴"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"생체 인식 + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"생체 인식 + 비밀번호"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"생체 인식 없이 계속"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"생체 인식을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"관리자, 암호화 정책 또는 사용자 인증 정보 저장소에 의해 사용 중지됨"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"스와이프"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"기기 MAC 주소"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"무작위 MAC 주소"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 주소"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"네트워크 세부정보"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"서브넷 마스크"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"올바른 게이트웨이 주소를 입력하세요."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"올바른 DNS 주소를 입력하세요."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0에서 32 사이의 네트워크 접두어 길이를 입력해 주세요."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1(비공개 DNS가 우선 적용되지 않는 경우)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2(비공개 DNS가 우선 적용되지 않는 경우)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"게이트웨이"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"네트워크 접두어 길이"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"비밀번호 설정 후 얼굴인식 잠금해제 설정"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"패턴 설정 후 얼굴인식 잠금해제 설정"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"PIN 설정 후 얼굴인식 잠금해제 설정"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"생체 인식 사용을 위한 비밀번호 설정"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"생체 인식 사용을 위한 패턴 설정"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"생체 인식 사용을 위한 PIN 설정"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"비밀번호를 잊으셨나요?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"패턴을 잊으셨나요?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN을 잊으셨나요?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"설정되지 않음 - 직장 프로필"</string>
     <string name="user_admin" msgid="4024553191395768119">"관리자"</string>
     <string name="user_you" msgid="3070562015202859996">"나(<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"닉네임"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"사용자 <xliff:g id="USER_COUNT">%1$d</xliff:g>명까지 추가 가능"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"태블릿의 소유자만 사용자를 관리할 수 있습니다."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"휴대전화의 소유자만 사용자를 관리할 수 있습니다."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"뒤로"</string>
     <string name="wizard_next" msgid="3884832431439072471">"다음"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"완료"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"사진 찍기"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"이미지 선택"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"사진 선택"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 카드"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 카드"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"생체 인식을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"생체 인식 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"생체 인식을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"예"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"아니요"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"제한됨"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>에 연결된 경우 사용할 수 없음"</string>
     <string name="see_more" msgid="7499355691042812723">"더보기"</string>
     <string name="see_less" msgid="2642392725363552793">"간략히 보기"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>을(를) 사용 중지하시겠습니까?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM을 사용 중지하시겠습니까?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM을 사용 중지하는 중<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"이동통신사를 사용 중지할 수 없음"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"문제가 발생하여 이동통신사를 사용 중지하지 못했습니다."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"기기에 연결"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> 앱에서 임시 Wi‑Fi 네트워크를 사용하여 기기에 연결하려고 합니다."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"기기가 없습니다. 기기가 켜져 있으며 연결 가능한지 확인하세요."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4107401..11506f7 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды кулпулоо, жүзүнөн таануу"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды кулпулоо, манжа изи"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Экран кулпусу"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Телефондун кулпусун жүзүңүз жана манжа изиңиз менен ачыңыз"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Колдонмолорго кирип, төлөмдү ырастай аласыз"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Кулпуну ачуу ыкмасын тандаңыз:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Жүзүнөн таанып ачуу"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Телефондун кулпусун оңой ачуу"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Манжа изи"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Телефондун кулпусун бир тийип ачуу"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Өткөрүп жиберүү"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Кийинки"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Жүз кошулду"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Жүзүнөн таануу функциясын жөндөө"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Жүзүнөн таануу"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Бул түзмөктүн кулпусун манжаңыздын изи менен ачууга болбойт. Кененирээк маалымат алгыңыз келсе, ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда, графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Жокко чыгаруу"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жок, рахмат"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Улантуу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткөрүп жиберүү"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Кийинки"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Планшетиңизди экранды бөгөттөө опциясы менен коргосоңуз, ал жоголуп же уурдалып кетсе, эч ким аны колдоно албай калат. Ошондой эле, жүзүнөн таанууну жөндөө үчүн да экранды бөгөттөө функциясы керек болот. Артка кайтуу үчүн, \"Жокко чыгарууну\" таптаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Түзмөгүңүздү экранды бөгөттөө опциясы менен коргосоңуз, ал жоголуп же уурдалып кетсе, эч ким аны колдоно албай калат. Ошондой эле, жүзүнөн таанууну жөндөө үчүн да экранды бөгөттөө функциясы керек болот. Артка кайтуу үчүн, \"Жокко чыгарууну\" таптаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Жүзүнөн таанып ачууну жөндөө үчүн, телефондун экранын кулпулоону иштетүү керек. Ушуну менен, телефонуңуз жоголуп же бирөө уурдап кетсе, анын ичиндегилерди эч ким көрө албай калат. Артка кайтуу үчүн, \"Жок\" дегенди басыңыз."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Планшетиңизди экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Түзмөгүңүздү экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Телефонуңузду экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN кодду жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Сырсөздү жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Графикалык ачкычты жөндөөнү өткөрүп жибересизби?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул планшетти сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Камдык экраныңызды кулпулоонун кошумча ыкмасын коюңуз"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Экранды кулпулоо параметрлери"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Экранды кулпулоо параметрлери"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Экранды кулпулоо"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Жүзүнөн таануу + Сырсөз"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Жүзүнөн таануу функциясыз уланта берүү"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Телефонуңуздун кулпусун жүзүңүздү көрсөтүп ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + Графикалык ачкыч"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + Сырсөз"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометрикасыз улантуу"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Телефонуңуздун кулпусун биометрикаңыз менен ача аласыз. Коопсуздук максатында, кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Администратор же башка эрежелер б-ча тыюу салынган"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Жок"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сүрүү"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Түзмөктүн MAC дареги"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Туш келди MAC дареги"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP дарек"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Тармактын чоо-жайы"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Көмөкчү тармактын маскасы"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Жарактуу шлюз дарегин териңиз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Жарактуу DNS дарегин териңиз."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Тармактын префикси 0дөн 32ге чейин болушу керек."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Купуя DNS тарабынан өзгөртүлбөсө)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Купуя DNS тарабынан өзгөртүлбөсө)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Тармак префиксинин узуну"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Сырсөздү коюңуз"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Графикалык ачкычты коюңуз"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Функцияны колдонуу үчүн PIN код коюңуз"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Биометрика менен кошо сырсөздү коюңуз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Биометрика менен кошо графикалык ачкычты коюңуз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Биометрика менен кошо PIN кодду коюңуз"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Сырсөзүңүздү унутуп койдуңузбу?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Графикалык ачкычты унутуп койдуңузбу?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN кодуңузду унутуп койдуңузбу?"</string>
@@ -1854,7 +1835,7 @@
     <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Ырастоо үчүн графикалык ачкычты дагы бир жолу тартыңыз"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Жаңы графикалык ачкычыңыз"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Ырастоо"</string>
-    <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Кайра тартуу"</string>
+    <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Кайра тартам"</string>
     <string name="lockpattern_retry_button_text" msgid="4229668933251849760">"Тазалоо"</string>
     <string name="lockpattern_continue_button_text" msgid="5253269556259503537">"Улантуу"</string>
     <string name="lockpattern_settings_title" msgid="9223165804553269083">"Кулпуну ачуу үлгүсү"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Коюлган эмес – Жумуш профили"</string>
     <string name="user_admin" msgid="4024553191395768119">"Админ"</string>
     <string name="user_you" msgid="3070562015202859996">"Сиз (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Каймана аты"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> чейин колдонуучу кошсоңуз болот"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Планшеттин ээси гана колдонуучуларды башкара алат."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Телефондун ээси гана колдонуучуларды башкара алат."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Артка"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Кийинки"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Аяктоо"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сүрөткө тартуу"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Сүрөт тандоо"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Сүрөт тандаңыз"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карталар"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карталар"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо PIN код менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. PIN кодду коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо графикалык ачкыч менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. Графикалык ачкычты коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо сырсөз менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. Сырсөздү коёсузбу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ооба"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Жок"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Чектелген"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна туташып турганда жеткиликсиз"</string>
     <string name="see_more" msgid="7499355691042812723">"Дагы көрүү"</string>
     <string name="see_less" msgid="2642392725363552793">"Азыраак көрүү"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өчүрүлсүнбү?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-карта өчүрүлсүнбү?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-карта өчүрүлүүдө<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Байланыш оператору өчүрүлгөн жок"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бир жерден ката кетти, байланыш операторуңуз өчүрүлгөн жок."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Түзмөккө туташуу"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> түзмөгүңүзгө убактылуу Wi‑Fi тармагы аркылуу туташканы жатат"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Түзмөктөр табылган жок. Түзмөктөр күйгүзүлүп, байланышууга даяр экенин текшериңиз."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4ea8006..262de8c 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ລັອກໜ້າຈໍ, ການປົດລັອກດ້ວຍໃບໜ້າ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ການລັອກໜ້າຈໍ, ລາຍນິ້ວມື"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ການລັອກໜ້າຈໍ"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຢ່າງປອດໄພດ້ວຍໃບໜ້າ ແລະ ລາຍນິ້ວມືທ່ານ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ທ່ານສາມາດເຂົ້າສູ່ລະບົບຫາແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນໄດ້ນຳ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ປົດລັອກດ້ວຍໜ້າ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຢ່າງງ່າຍດາຍ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ລາຍນີ້ວມື"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ປະຢັດເວລາປົດລັອກໂທລະສັບໃນຖົງໂສ້ງຂອງທ່ານ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ຂ້າມ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ຕໍ່ໄປ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ເພີ່ມໜ້າແລ້ວ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ປົດລັອກດ້ວຍໜ້າ"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"​ຍົກ​ເລີກ"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ບໍ່, ຂອບໃຈ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"​ສືບ​ຕໍ່"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ຂ້າມ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ຕໍ່ໄປ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ໂດຍການປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ໂດຍການປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ໂດຍການປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ໂດຍການປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ໂດຍການປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ໂດຍການປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ຂ້າມການຕັ້ງລະຫັດ PIN ບໍ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ຂ້າມການຕັ້ງລະຫັດບໍ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ຂ້າມການຕັ້ງຮູບແບບປົດລັອກບໍ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ຕັ້ງ​ວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ສຳ​ຮອງ​ຂໍ້​ມູນ​ຂອງ​ທ່ານ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ເລືອກວິທີລັອກໜ້າຈໍການສຳຮອງຂອງທ່ານ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ການລັອກໜ້າຈໍ"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ປົດລັອກດ້ວຍໜ້າ + ລະຫັດຜ່ານ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ສືບຕໍ່ໂດຍບໍ່ຕ້ອງໃຊ້ການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ໃບໜ້າຂອງທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ລະບົບຊີວະມິຕິ + ຮູບແບບ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ລະບົບຊີວະມິຕິ + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ລະບົບຊີວະມິຕິ + ລະຫັດຜ່ານ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ສືບຕໍ່ໂດຍບໍ່ໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ລະບົບຊີວະມິຕິທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼື ບ່ອນຈັດເກັບຂໍ້ມູນລັບ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ປັດ​ໄປ​ຂ້າງ"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ທີ່ຢູ່ MAC ຂອງອຸປະກອນ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ທີ່ຢູ່ MAC ທີ່ສຸ່ມມາ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ທີ່ຢູ່ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ລາຍລະອຽດເຄືອຂ່າຍ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet Mask"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ພິມທີ່ຢູ່ gateway ທີ່ຖືກຕ້ອງ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ພິມທີ່ຢູ່ DNS ທີ່ຖືກຕ້ອງ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"ພິມຄວາມຍາວ network prefix ລະຫວ່າງ 0 ຫາ 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ເວັ້ນເສຍແຕ່ຈະຖືກຍົກເລີກໂດຍ DNS ສ່ວນຕົວ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ເວັ້ນເສຍແຕ່ຈະຖືກຍົກເລີກໂດຍ DNS ສ່ວນຕົວ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ຄວາມຍາວ Network prefix"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ກະລຸນາຕັ້ງລະຫັດຜ່ານເພື່ອປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ກະລຸນາຕັ້ງຮູບແບບເພື່ອໃຊ້ການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ກະລຸນາຕັ້ງ PIN ເພື່ອປົດລັອກດ້ວຍໜ້າ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ຕັ້ງລະຫັດຜ່ານກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ຕັ້ງຮູບແບບກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ຕັ້ງ PIN ກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ລືມລະຫັດຜ່ານຂອງທ່ານບໍ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ລືມຮູບແບບຂອງທ່ານບໍ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ລືມ PIN ຂອງທ່ານບໍ?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"​ບໍ່​ໄດ້​ຕິດ​ຕັ້ງ - ​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="user_admin" msgid="4024553191395768119">"ຜູ້​ຄວບ​ຄຸມ"</string>
     <string name="user_you" msgid="3070562015202859996">"ທ່ານ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ຊື່ຫຼິ້ນ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ທ່ານ​ສາ​ມາດ​ເພີ່ມ​ຜູ້​ໃຊ້​ໄດ້​ເຖິງ <xliff:g id="USER_COUNT">%1$d</xliff:g> ຄົນ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ສະເພາະເຈົ້າຂອງແທັບເລັດທີ່ສາມາດຈັດການຜູ່ໃຊ້ໄດ້."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ສະເພາະເຈົ້າຂອງໂທລະສັບທີ່ສາມາດຈັດການຜູ່ໃຊ້ໄດ້."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ກັບຄືນ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ຕໍ່ໄປ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ແລ້ວໆ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ຖ່າຍຮູບ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ເລືອກຮູບ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ເລືອກຮູບ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ກາດ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ກາດ"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ແມ່ນແລ້ວ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ບໍ່"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ຈຳກັດ"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ບໍ່ສາມາດໃຊ້ໄດ້ເມື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"ເບິ່ງເພີ່ມເຕີມ"</string>
     <string name="see_less" msgid="2642392725363552793">"​​ເບິ່ງ​ໜ້ອຍ​ລົງ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ປິດ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ໄວ້ບໍ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ປິດ SIM ບໍ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ກຳລັງປິດ SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ບໍ່ສາມາດປິດການຳໃຊ້ຜູ້ໃຫ້ບໍລິການ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ ແລະ ບໍ່ສາມາດປິດການນຳໃຊ້ຜູ້ໃຫ້ບໍລິການຂອງທ່ານໄດ້."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ເຊື່ອມຕໍ່ຫາອຸປະກອນ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ແອັບ <xliff:g id="APPNAME">%1$s</xliff:g> ຕ້ອງການໃຊ້ເຄືອຂ່າຍ Wi‑Fi ຊົ່ວຄາວເພື່ອເຊື່ອມຕໍ່ຫາອຸປະກອນຂອງທ່ານ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ບໍ່ພົບອຸປະກອນ. ກະລຸນາກວດສອບວ່າເປີດອຸປະກອນແລ້ວ ແລະ ສາມາດເຊື່ອມຕໍ່ໄດ້."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1e98850..f10813a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrano užraktas, atrakinimas pagal veidą"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrano užraktas, piršto antspaudas"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekrano užraktas"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Saugiai atrakinkite telefoną veidu ir kontroliniu kodu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Galite prisijungti prie programų ir patvirtinti mokėjimą"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nustatyti atrakinimą naudojant:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Atrakinimas pagal veidą"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Palengvinkite telefono atrakinimą"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Kontrolinis kodas"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Atrakinkite telefoną dar kišenėje"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Praleisti"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Kitas"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Veidas pridėtas"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nustatykite Atrakinimą pagal veidą"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Atrakinimas pagal veidą"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: negalite atrakinti šio įrenginio piršto atspaudu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: piršto atspaudas gali būti ne toks saugus kaip patikimas atrakinimo piešinys ar PIN kodas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atšaukti"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, ačiū"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tęsti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Praleisti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Kitas"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Pasirinkę ekrano užrakto parinktį apsaugosite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Pasirinkę ekrano užrakto parinktį apsaugosite įrenginį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Pasirinkę ekrano užrakto parinktį apsaugosite telefoną, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Pasirinkę ekrano užrakto parinktį apsaugosite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Pasirinkę ekrano užrakto parinktį apsaugosite įrenginį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Pasirinkę ekrano užrakto parinktį apsaugosite telefoną, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Praleisti PIN kodo sąranką?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Praleisti slaptažodžio sąranką?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Praleisti atrakinimo piešinio sąranką?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Nustatykite atsarginį ekrano užrakto metodą"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekrano užrakto parinktys"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekrano užrakto parinktys"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekrano užraktas"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Atrakinimas pagal veidą ir slaptažodis"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Tęsti nenaudojant Atrakinimo pagal veidą"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefoną galite atrakinti naudodami veidą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriniai duomenys ir atrakinimo piešinys"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriniai duomenys ir PIN kodas"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriniai duomenys ir slaptažodis"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Tęsti be biometrinių duomenų"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefoną galite atrakinti naudodami biometrinius duomenis. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Neleido: admin., šifr. polit. ar pr. duom. atmin."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Perbraukti"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Įrenginio MAC adresas"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Atsitiktinis MAC adresas"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresas"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Išsami tinklo info."</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Potinklio kaukė"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Įveskite galiojantį tinklų sietuvo adresą."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Įveskite galiojantį DNS adresą."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Įveskite 0–32 simbolių tinklo kodą."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nebent nepaisoma taikant privačią DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nebent nepaisoma taikant privačią DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Tinklų sietuvas"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tinklo kodo ilgis"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Tiesiog. „Wi-Fi“ r."</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"N. naud. Atr. pagal v., nust. slaptaž."</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"N. naud. Atr. pagal v., nust. atr. pieš."</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"N. naud. Atr. pagal v., nust. slaptažodį"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Nustatykite slaptažodį (biometr. duom.)"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Nustatyk. atrak. pieš. (biometr. duom.)"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Nustatykite PIN kodą (biometr. duomen.)"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Pamiršote slaptažodį?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Pamiršote atrakinimo piešinį?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Pamiršote PIN kodą?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nenustatytas – darbo profilis"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratorius"</string>
     <string name="user_you" msgid="3070562015202859996">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Slapyvardis"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Galite pridėti iki <xliff:g id="USER_COUNT">%1$d</xliff:g> naudotoj."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Tik planšetinio kompiuterio savininkas gali tvarkyti naudotojus."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Tik telefono savininkas gali tvarkyti naudotojus."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atgal"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Kitas"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Užbaigti"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotografuoti"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pasirinkti vaizdą"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pasirinkti nuotrauką"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kortelės"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kortelės"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti PIN kodą prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti PIN kodo paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami nubrėžti atrakinimo piešinį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti atrakinimo piešinio paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant įvesti slaptažodį. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Taip"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Apribota"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nepasiekiama, kai prisijungta prie „<xliff:g id="CARRIER">%1$s</xliff:g>“"</string>
     <string name="see_more" msgid="7499355691042812723">"Žr. daugiau"</string>
     <string name="see_less" msgid="2642392725363552793">"Žr. mažiau"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Išjungti „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Išjungti SIM kortelę?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Išjungiama SIM kortelė<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nepavyksta išjungti operatoriaus"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kažkas nepavyko, todėl operatorius nebuvo išjungtas."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Prijungimas prie įrenginio"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Programa „<xliff:g id="APPNAME">%1$s</xliff:g>“ nori naudoti laikiną „Wi‑Fi“ tinklą, kad galėtų prisijungti prie jūsų įrenginio"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nerasta jokių įrenginių. Įsitikinkite, kad įrenginiai įjungti ir prie jų galima prisijungti."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3f72488..927eb84 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrāna bloķēšana, autorizācija pēc sejas"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrāna bloķēšana, pirksta nospiedums"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekrāna bloķēšana"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Droša tālruņa atbloķēšana ar seju un pirksta nospiedumu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Varat arī pierakstīties lietotnēs un apstiprināt maksājumus"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Iestatiet sensorus, ar ko atbloķēt."</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Autorizācija pēc sejas"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Atvieglot tālruņa atbloķēšanu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Pirksta nospiedums"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Taupiet laiku, atbloķējot tālruni kabatā"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Izlaist"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tālāk"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Seja pievienota"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Iestatiet autorizāciju pēc sejas"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Autorizācija pēc sejas"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedumu 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_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atcelt"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nē, paldies"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Turpināt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Izlaist"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tālāk"</string>
@@ -458,12 +448,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ja aizsargāsiet savu planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot planšetdatoru tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ja aizsargāsiet savu ierīci, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot ierīci, ja tā tiks nozagta vai pazaudēta. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ja aizsargāsiet savu tālruni, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot tālruni tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ja aizsargāsiet savu planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot planšetdatoru tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ja aizsargāsiet savu ierīci, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot ierīci tās nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ja aizsargāsiet savu tālruni, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot tālruni tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vai izlaist PIN iestatīšanu?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vai izlaist paroles iestatīšanu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vai izlaist kombinācijas iestatīšanu?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Iestatiet rezerves ekrāna bloķēšanas metodi."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekrāna bloķēšanas opcijas"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekrāna bloķēšanas opcijas"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekrāna bloķēšana"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Autorizācija pēc sejas un parole"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Turpināt bez autorizācijas pēc sejas"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Varat atbloķēt savu tālruni, izmantojot seju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija un kombinācija"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija un PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija un parole"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Turpināt bez biometrijas"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Varat atbloķēt savu tālruni, izmantojot biometriju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Atspējoja administrators, šifrēšanas politika vai akreditācijas datu maiņa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vilkt"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Ierīces MAC adrese"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nejauši atlasīta MAC adrese"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adrese"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Dati par tīklu"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Apakštīkla maska"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ierakstiet derīgu vārtejas adresi."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ierakstiet derīgu sistēmas DNS adresi."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ierakstiet tīkla prefiksa garumu diapazonā 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ja vien to neignorē privātā DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ja vien to neignorē privātā DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Vārteja"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tīkla prefiksa garums"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1835,12 +1819,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Rezerves metode autorizācijai pēc sejas"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Rezerves metode autorizācijai pēc sejas"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Rezerves metode autorizācijai pēc sejas"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Lai lietotu biometriju, iestatiet paroli"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Rezerves metode biometrijas atbloķēšanai"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Lai lietotu biometriju, iestatiet PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Vai aizmirsāt paroli?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Vai aizmirsāt kombināciju?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Vai aizmirsāt PIN?"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Darba profils — nav iestatīts"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrators"</string>
     <string name="user_you" msgid="3070562015202859996">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Segvārds"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Varat pievienot līdz pat <xliff:g id="USER_COUNT">%1$d</xliff:g> lietotājiem."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Lietotājus var pārvaldīt tikai planšetdatora īpašnieks."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Lietotājus var pārvaldīt tikai tālruņa īpašnieks."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atpakaļ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tālāk"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Pabeigt"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Uzņemt fotoattēlu"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Izvēlēties attēlu"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Atlasīt fotoattēlu"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartes"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartes"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Jā"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nē"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ierobežota"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nav pieejams, ja izveidots savienojums ar operatoru <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Skatīt vairāk"</string>
     <string name="see_less" msgid="2642392725363552793">"Skatīt mazāk"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vai izslēgt pakalpojumu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vai izslēgt SIM karti?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Notiek SIM kartes izslēgšana<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Mobilo sakaru operatoru nevar atspējot"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Radās kļūda, un mobilo sakaru operatoru nevarēja atspējot."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Savienojuma izveide ar ierīci"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Lietotne <xliff:g id="APPNAME">%1$s</xliff:g> vēlas izmantot pagaidu Wi‑Fi tīklu, lai izveidotu savienojumu ar jūsu ierīci."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nav atrasta neviena ierīce. Ierīcēm ir jābūt ieslēgtām un pieejamām savienojuma izveidei."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index cf2e168..fadeac6 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заклучување екран, отклучување со лик"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Заклучување екран, отпечаток"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Заклучување екран"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Отклучувајте го телефонот безбедно со лицето и отпечаток"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Може да се најавувате на апликации и да потврдувате плаќања"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Поставете отклучување со:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Отклучување со лик"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Лесно отклучувајте го телефонот"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отпечаток"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Отклучувајте го телефонот уште в џеб"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прескокни"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Следно"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Додаден е лик"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Поставете „Отклучување со лик“"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Отклучување со лик"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: не може да го користите отпечатокот за да го отклучувате уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, фала"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескокни"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Следно"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ако го заштитите таблетот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ако го заштитите уредот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ако го заштитите телефонот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ако го заштитите таблетот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ако го заштитите уредот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ако го заштитите телефонот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Да се прескокне поставувањето PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Да се прескокне поставувањето лозинка?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Да се прескокне поставувањето шема?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Поставете резервен метод за заклучување на екранот"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Изберете резервен метод за заклучување на екранот"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опции за заклучување на екранот"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опции за заклучување на екранот"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Заклучување екран"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Отклучување со лик + лозинка"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продолжете без „Отклучување со лик“"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Може да го отклучите телефонот со лицето. Од безбедносни причини, потребно резервно заклучување екран за оваа опција."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + шема"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + лозинка"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продолжи без биометрика"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Може да го отклучите телефонот со биометрика. Од безбедносни причини, за оваа опција е потребно резервно заклучување на екранот."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Оневозм. од админ., шифрир. или складир. акредит."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ниедна"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Повлечи"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адреса на уредот"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Рандомизирана MAC-адреса"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Детали за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Подмрежна маска"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Внеси важечка адреса на капија."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Внеси важечка адреса на DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Внесете мрежен префикс со должина од 0 до 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (освен ако не се отфрли од Приватен DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (освен ако не се отфрли од Приватен DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Портал"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Должина на мрежен префикс"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"За „Отклучување со лик“, постави лозинка"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"За „Отклучување со лик“, поставете шема"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"За „Отклучување со лик“, поставете PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Поставете лозинка"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Поставете шема"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Поставете PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ја заборавивте лозинката?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ја заборавивте шемата?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Го заборавивте PIN-кодот?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не е поставен – Работен профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вие (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Прекар"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Може да додадете најмногу <xliff:g id="USER_COUNT">%1$d</xliff:g> корисници"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само сопственикот на таблетот може да управува со корисниците."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само сопственикот на телефонот може да управува со корисниците."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Следно"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Заврши"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Фотографирајте"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Изберете слика"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Избери фотографија"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-картички"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-картички"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање PIN пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање шема пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање PIN пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање шема пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недостапно кога сте поврзани на <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Видете повеќе"</string>
     <string name="see_less" msgid="2642392725363552793">"Види помалку"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се исклучи <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се исклучи SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Се исклучува SIM-картичката<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не може да се оневозможи операторот"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешто тргна наопаку и не можеше да се оневозможи операторот."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Поврзување со уредот"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Апликацијата <xliff:g id="APPNAME">%1$s</xliff:g> сака да користи привремена Wi‑Fi мрежа за да се поврзе со уредот"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Не се најдени уреди. Уверете се дека уредите се вклучени и достапни за поврзување."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b452814..f5e8547 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"സ്ക്രീൻ ലോക്ക്, മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"സ്‌ക്രീൻ ലോക്കും ഫിംഗർപ്രിന്റും"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"സ്ക്രീൻ ലോക്ക്"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"മുഖവും ഫിംഗർപ്രിന്റും ഉപയോഗിച്ച് സുരക്ഷിതമായി അൺലോക്ക് ചെയ്യൂ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനുമാകും"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ഇതുപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ഫോൺ അൺലോക്ക് ചെയ്യുന്നത് എളുപ്പമാക്കൂ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ഫിംഗർപ്രിന്റ്"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"പോക്കറ്റിൽ ഫോൺ അൺലോക്ക് ചെയ്ത് സമയം ലാഭിക്കൂ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ഒഴിവാക്കുക"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"അടുത്തത്"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"മുഖം ചേർത്തു"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാൻ കഴിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്‌മിനെ ബന്ധപ്പെടുക."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്‍റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ശക്തമായ പാറ്റേൺ, പിൻ എന്നിവയേക്കാൾ ഫിംഗർപ്രിന്‍റിന് സുരക്ഷ കുറവായിരിക്കും."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"റദ്ദാക്കുക"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"വേണ്ട"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"തുടരൂ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ഒഴിവാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"അടുത്തത്"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"നിങ്ങളുടെ ഉപകരണം സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"നിങ്ങളുടെ ഫോൺ സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"സ്ക്രീൻ ലോക്ക് ഓപ്ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ടാബ്‌ലെറ്റ് പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"സ്ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ഉപകരണം പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"സ്ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"പിൻ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"പാസ്‌വേഡ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"പാറ്റേൺ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"നിങ്ങളുടെ ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് രീതി സജ്ജമാക്കുക"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"നിങ്ങളുടെ ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"സ്ക്രീൻ ലോക്ക്"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് + പാസ്‌വേഡ്"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഇല്ലാതെ തുടരുക"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"നിങ്ങളുടെ മുഖം ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാവും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ബയോമെട്രിക്‌സ് + പാറ്റേൺ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ബയോമെട്രിക്‌സ് + പിൻ"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ബയോമെട്രിക്‌സ് + പാസ്‌വേഡ്"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ബയോമെട്രിക്‌സ് ചേർക്കാതെ തുടരുക"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാകും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"അഡ്‌മിനോ എൻക്രിപ്‌ഷൻ നയമോ ക്രെഡൻഷ്യൽ സ്റ്റോറേജോ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ഒന്നുമില്ല"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"സ്വൈപ്പ് ചെയ്യുക"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ഉപകരണ MAC വിലാസം"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ക്രമരഹിതമാക്കിയ MAC വിലാസം"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP വിലാസം"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"നെറ്റ്‌വർക്ക് വിശദാംശങ്ങൾ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"സാധുവായ ഗേറ്റ്‌വേ വിലാസം ടൈപ്പുചെയ്യുക."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"സാധുവായ DNS വിലാസം ടൈപ്പുചെയ്യുക."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0, 30 എന്നിവയ്‌ക്കിടയിലുള്ള ഒരു നെറ്റ്‌വർക്ക് പ്രിഫി‌ക്സ് ദൈർഘ്യം ടൈപ്പുചെയ്യുക."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (സ്വകാര്യ DNS അസാധുവാക്കിയില്ലെങ്കിൽ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (സ്വകാര്യ DNS അസാധുവാക്കിയില്ലെങ്കിൽ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ഗേറ്റ്‌വേ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"നെറ്റ്‌വർക്ക് പ്രിഫിക്‌സ് ദൈർഘ്യം"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi ഡയറക്‌ട്"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പാസ്‍വേഡ് സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പാറ്റേൺ സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പിൻ സജ്ജീകരിക്കൂ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ബയോമെട്രിക്സിനായി പാസ്‍വേഡ് സജ്ജീകരിക്കൂ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ബയോമെട്രിക്‌സിനായി പാറ്റേൺ സജ്ജീകരിക്കൂ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ബയോമെട്രിക്‌സിനായി പിൻ സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"പാസ്‌വേഡ് മറന്നോ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"പാറ്റേൺ മറന്നോ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"പിൻ മറന്നോ?"</string>
@@ -1991,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ആപ്പ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"നിങ്ങൾ ഈ ആപ്പ് പ്രവർത്തനരഹിതമാക്കിയാൽ, Android-ഉം മറ്റ് ആപ്പുകളും ഇനി ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിച്ചേക്കില്ല. ശ്രദ്ധിക്കുക, നിങ്ങളുടെ ഉപകരണത്തിൽ മുമ്പേ ഇൻസ്‌റ്റാൾ ചെയ്‌തതായതിനാൽ ഈ ആപ്പ് നിങ്ങൾക്ക് ഇല്ലാതാക്കാനാവില്ല. പ്രവർത്തനരഹിതമാക്കുന്നത് വഴി, ഈ ആപ്പ് ഓഫാക്കി നിങ്ങൾക്കിത് ഉപകരണത്തിൽ മറച്ചു വയ്ക്കാം."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"അറിയിപ്പുകൾ ഓഫാക്കണോ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"സ്റ്റോർ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ആപ്പ് വിശദാംശങ്ങൾ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> എന്നതിൽ നിന്ന് ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> സംബന്ധിച്ച കൂടുതൽ ‌വിവരങ്ങൾ"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"സജ്ജീകരിച്ചിട്ടില്ല - ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="user_admin" msgid="4024553191395768119">"അഡ്‌മിന്‍"</string>
     <string name="user_you" msgid="3070562015202859996">"നിങ്ങൾ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"വിളിപ്പേര്"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> ഉപയോക്താക്കളെ വരെ നിങ്ങൾക്ക് ചേർക്കാം"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ടാബ്‌ലെറ്റ് ഉടമയ്‌ക്ക് മാത്രമേ ഉപയോക്താക്കളെ നിയന്ത്രിക്കാനാകൂ."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ഫോൺ ഉടമയ്‌ക്ക് മാത്രമേ ഉപയോക്താക്കളെ നിയന്ത്രിക്കാനാകൂ."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"മടങ്ങുക"</string>
     <string name="wizard_next" msgid="3884832431439072471">"അടുത്തത്"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"പൂര്‍ത്തിയാക്കുക"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ഒരു ഫോട്ടോ എടുക്കുക"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ഒരു ചിത്രം തിരഞ്ഞെടുക്കുക"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"സിം കാർഡുകൾ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"സിം കാർഡുകൾ"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പിൻ ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പിൻ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാറ്റേൺ ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാസ്‌വേഡ് ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട  ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പാസ്‌വേഡ് ആവശ്യമാക്കണോ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പിൻ ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ നിർബന്ധമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാറ്റേൺ ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ നിർബന്ധമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാസ്‌വേഡ് ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് നിർബന്ധമാക്കണോ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"അതെ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ഇല്ല"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"നിയന്ത്രിതം"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്‌തിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
     <string name="see_more" msgid="7499355691042812723">"കൂടുതൽ കാണുക"</string>
     <string name="see_less" msgid="2642392725363552793">"കുറച്ച് കാണുക"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ഓഫാക്കണോ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ഓഫാക്കണോ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"സിം ഓഫാക്കുന്നു<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനാകുന്നില്ല"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"എന്തോ കുഴപ്പം സംഭവിച്ചതിനാൽ നിങ്ങളുടെ സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനായില്ല."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ഉപകരണത്തിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"നിങ്ങളുടെ ഉപകരണത്തിലേക്ക് കണക്‌റ്റ് ചെയ്യുന്നതിന് താൽക്കാലിക വെെഫെെ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കാൻ <xliff:g id="APPNAME">%1$s</xliff:g> ആപ്പ് താൽപ്പര്യപ്പെടുന്നു"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല. ഉപകരണം ഓണാണെന്നും കണക്റ്റ് ചെയ്യാൻ ലഭ്യമാണെന്നും ഉറപ്പാക്കുക."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ef77c6a..5b04858 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Дэлгэцийн түгжээ, царайгаар тайлах"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Дэлгэцийн түгжээ, хурууны хээ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Дэлгэцийн түгжээ"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Утасныхаа түгжээг царай, хурууны хээгээр аюулгүй тайлаарай"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Та мөн аппуудад нэвтэрч, төлбөрөө баталгаажуулах боломжтой"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Түгжээ тайлахыг дараахаар тохируулаарай:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Царайгаар тайлах"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Утасны түгжээгээ тайлахыг хурдан болгоорой"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Хурууны хээ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Утасныхаа түгжээг халаасандаа тайлж цаг хэмнээрэй"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Алгасах"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Дараах"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Царай нэмсэн"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Царайгаар тайлах онцлогийг тохируулах"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Царайгаар тайлах"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу.\n\nСанамж: Та хурууны хээгээр энэ төхөөрөмжийн түгжээг тайлах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхөд хурууны хээгээ ашиглана уу.\n\nСанамж: Таны хурууны хээ нь хүчтэй зурган түгжээ эсвэл PIN-с хамгаалалт муутай байж болзошгүй."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Цуцлах"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Үгүй баярлалаа"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Үргэлжлүүлэх"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Алгасах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Дараагийн"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Та таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Та төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Та утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Та таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг гээсэн эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Та төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг гээсэн эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Та утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ПИН-н тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Нууц үгийн тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Хээний тохируулгыг алгасах уу?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ таблетийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Нөөцлөлтийн дэлгэц түгжих аргыг тохируулах"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Дэлгэц түгжих нөөц аргачлалаа сонгох"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Дэлгэцийн түгжээний сонголт"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Дэлгэцийн түгжээний сонголт"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Дэлгэцийн түгжээ"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Царайгаар тайлах + Нууц үг"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Царайгаар тайлах онцлоггүйгээр үргэлжлүүлэх"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Та царайгаа ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометр + Хээ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометр + ПИН"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометр + Нууц үг"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометргүйгээр үргэлжлүүлэх"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Та биометрээ ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод дэлгэцийн нөөц түгжээ шаардлагатай."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Админ, шифрлэлтийн бодлого, эсвэл итгэмжлэлийн сангаас цуцалсан"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Байхгүй"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Шудрах"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Төхөөрөмжийн MAC хаяг"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Санамсаргүй сонгосон MAC хаяг"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP хаяг"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Сүлжээний мэдээлэл"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet маск"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Зөв гарцын хаяг оруулна уу."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Зөв DNS хаяг оруулна уу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 болон 32 хооронд урттай сүлжээний угтварыг бичнэ үү."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Хувийн DNS-с дараагүй бол)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Хувийн DNS-с дараагүй бол)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Гарц"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Сүлжээний угтварын урт"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Шууд"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Царайгаар тайлахыг ашиглахын тулд нууц үг тохируулна уу"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Царайгаар тайлахыг ашиглахын тулд хээ тохируулна уу"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Царайгаар тайлахыг ашиглахын тулд ПИН тохируулна уу"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Биометр ашиглахын тулд нууц үг тохируулаарай"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Биометр ашиглахын тулд хээ тохируулаарай"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Биометр ашиглахын тулд ПИН тохируулаарай"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Нууц үгээ мартсан уу?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Хээгээ мартсан уу?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ПИН-ээ мартсан уу?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Тохируулаагүй - Ажлын профайл"</string>
     <string name="user_admin" msgid="4024553191395768119">"Админ"</string>
     <string name="user_you" msgid="3070562015202859996">"Та (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Хоч"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Та <xliff:g id="USER_COUNT">%1$d</xliff:g> хүртэлх хэрэглэгч нэмж болно"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Зөвхөн таблетын эзэмшигч л хэрэглэгчдийг удирдаж болно."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Зөвхөн утасны эзэмшигч л хэрэглэгчдийг удирдаж болно."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Буцах"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Дараагийн"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Дуусгах"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зураг авах"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Зураг сонгох"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Зураг сонгох"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"СИМ карт"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"СИМ карт"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө ПИН-ээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө хээгээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө нууц үгээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Тийм"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Үгүй"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Хязгаарласан"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-д холбогдсон үед боломжгүй"</string>
     <string name="see_more" msgid="7499355691042812723">"Дэлгэрэнгүй үзэх"</string>
     <string name="see_less" msgid="2642392725363552793">"Цөөнийг харах"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-г унтраах уу?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-г унтраах уу?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-г унтрааж байна<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Оператор компанийг идэвхгүй болгох боломжгүй"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Алдаа гарсан тул таны оператор компанийг идэвхгүй болгож чадсангүй."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Төхөөрөмжид холбох"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> апп таны төхөөрөмжид холбогдохын тулд түр зуурын Wi-Fi сүлжээ ашиглах хүсэлтэй байна"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Төхөөрөмж олдсонгүй. Төхөөрөмжүүдийг асаалттай бөгөөд холбогдох боломжтой эсэхийг нь шалгана уу."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 5417cc2..2f82984 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रीन लॉक, फेस अनलॉक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फिंगरप्रिंट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रीन लॉक"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"तुमचा चेहरा व फिंगरप्रिंटने तुमचा फोन सुरक्षितपणे अनलॉक करा"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"तुम्ही अ‍ॅप्समध्ये साइन इन करूनदेखील पेमेंट निश्चित करू शकता"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"यासोबत अनलॉक सेट करा:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"फेस अनलॉक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"तुमचा फोन अनलॉक करणे अत्यंत सोपे करा"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फिंगरप्रिंट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"तुमचा फोन खिशातच अनलॉक करून वेळ वाचवा"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"वगळा"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"पुढे"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"चेहरा जोडला आहे"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"फेस अनलॉक सेट करा"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"फेस अनलॉक"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमची फिंगरप्रिंट वापरा.\n\nटीप: क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करा"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"नाही, नको"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"सुरू ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"वगळा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"पुढील"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"स्क्रीन लॉक पर्यायासह तुमचा टॅबलेट संरक्षित केल्याने, तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"स्क्रीन लॉक पर्यायासह तुमचे डिव्हाइस संरक्षित केल्याने, ते हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"स्क्रीन लॉक पर्यायासह तुमचा फोन संरक्षित केल्याने, तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"स्क्रीन लॉक पर्यायाने तुमचा टॅबलेट संरक्षित केल्याने, तो हरवला किंवा चोरी झाला, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"स्क्रीन लॉक पर्यायाने तुमचे डिव्हाइस संरक्षित केल्याने, ते हरवले किंवा चोरी झाले, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"स्क्रीन लॉक पर्यायाने तुमचा फोन संरक्षित केल्याने, तो हरवला किंवा चोरी झाला, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"पिन सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"पॅटर्न सेट करणे वगळायचे का?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"तुमची बॅकअप स्क्रीन लॉक पद्धत सेट करा"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"तुमची बॅकअप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रीन लॉक पर्याय"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रीन लॉक पर्याय"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रीन लॉक"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"फेस अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"फेस अनलॉक शिवाय सुरू ठेवा"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"तुम्ही तुमचा चेहरा वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायासाठी बॅकअप स्क्रीन लॉक आवश्यक आहे."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक + पॅटर्न"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक + पिन"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक न वापरता सुरू ठेवा"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"तुमची बायोमेट्रिक वापरून तुम्ही तुमचा फोन अनलॉक करू शकता. सुरक्षेसाठी, या पर्यायाला बॅकअप स्क्रीन लॉकची आवश्यकता आहे."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, कूटबद्धीकरण धोरण किंवा क्रेडेन्शियल संचयनाद्वारे अक्षम केलेले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्‍वाइप करा"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"डिव्हाइसचा MAC ॲड्रेस"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"रँडमाइझ केलेला MAC पत्ता"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP पत्ता"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्क तपशील"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"वैध गेटवे पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"वैध DNS पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 आणि 32 दरम्यान नेटवर्क उपसर्ग लांबी टाइप करा."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (खाजगी DNS ओव्हरराइड करेपर्यंत)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (खाजगी DNS ओव्हरराइड करेपर्यंत)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लांबी"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"वाय-फाय डिरेक्ट"</string>
@@ -1814,12 +1798,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"फेस अनलॉक वापरण्यासाठी, पासवर्ड सेट करा"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"फेस अनलॉक वापरण्यासाठी, पॅटर्न सेट करा"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"फेस अनलॉक वापरण्यासाठी, पिन सेट करा"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"बायोमेट्रिक वापरण्यासाठी पासवर्ड सेट करा"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"बायोमेट्रिक वापरण्यासाठी, पॅटर्न सेट करा"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"बायोमेट्रिक वापरण्यासाठी, पिन सेट करा"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"तुमचा पासवर्ड विसरलात का?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"तुमचा पॅटर्न विसरलात का?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"तुमचा पिन विसरलात का?"</string>
@@ -1992,7 +1973,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"अ‍ॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"तुम्ही हे अ‍ॅप बंद केल्यास, Android आणि इतर अ‍ॅप्स कदाचित अपेक्षेप्रमाणे काम करणार नाहीत. लक्षात ठेवा, हे अ‍ॅप तुमच्या डिव्हाइसवर आधीच इंस्टॉल करून आलेले असल्यामुळे तुम्ही ते हटवू शकत नाही. बंद करून, तुम्ही हे अ‍ॅप बंद करता आणि ते तुमच्या डिव्हाइसवर लपवता."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"सूचना बंद करायच्या?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"स्टोअर"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"अ‍ॅप तपशील"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"अ‍ॅप <xliff:g id="APP_STORE">%1$s</xliff:g> मधून इंस्टॉल केला"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ची अधिक माहिती"</string>
@@ -3052,7 +3033,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट केलेले नाही - कार्य प्रोफाईल"</string>
     <string name="user_admin" msgid="4024553191395768119">"ॲडमिन"</string>
     <string name="user_you" msgid="3070562015202859996">"तुम्ही (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"टोपणनाव"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"तुम्ही सुमारे <xliff:g id="USER_COUNT">%1$d</xliff:g> वापरकर्ते जोडू शकता"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"केवळ टॅब्लेटचा मालक वापरकर्त्यांना व्यवस्थापित करु शकतो."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवळ फोनचा मालक वापरकर्त्यांना व्यवस्थापित करु शकतो."</string>
@@ -3172,9 +3152,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"परत"</string>
     <string name="wizard_next" msgid="3884832431439072471">"पुढील"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"समाप्‍त"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फोटो काढा"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"इमेज निवडा"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फोटो निवडा"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"सिम कार्ड"</string>
@@ -3910,12 +3887,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पिनचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पिनची आवश्यकता आहे का?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पॅटर्नचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्नची आवश्यकता आहे का?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पासवर्डचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्डची आवश्यकता आहे का?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पिन अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन अनिवार्य करायचा का?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पॅटर्न अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न अनिवार्य करायचा का?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पासवर्ड अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड अनिवार्य करायचा का?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"होय"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"नाही"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"प्रतिबंधित"</string>
@@ -4858,6 +4832,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
     <string name="see_more" msgid="7499355691042812723">"आणखी पाहा"</string>
     <string name="see_less" msgid="2642392725363552793">"कमी पहा"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> बंद करायचे आहे का?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"सिम बंद करायचे आहे का?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद करत आहे<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"वाहक बंद करू शकत नाही"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"काहीतरी गडबड झाली आणि तुमचा वाहक बंद करता आला नाही."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"डिव्हाइसशी कनेक्ट करा"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"तुमच्या डिव्हाइसशी कनेक्ट करण्यासाठी <xliff:g id="APPNAME">%1$s</xliff:g> ॲपला तात्पुरते वाय-फाय नेटवर्क वापरायचे आहे"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"डिव्हाइस सापडले नाही. डिव्हाइस सुरू केली आहेत आणि ती कनेक्ट करण्यासाठी उपलब्ध आहेत याची खात्री करा."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 081d9d2..563e8ae 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci skrin, wajah buka kunci"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci skrin, cap jari"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kunci skrin"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Buka kunci telefon dengan selamat dengan wajah dan cap jari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Anda boleh mendaftar masuk ke apl dan mengesahkan pembayaran"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Sediakan pembukaan kunci dengan:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Wajah buka kunci"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Mudahkan pembukaan kunci telefon"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Cap jari"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Jimat masa buka kunci telefon dalam poket anda"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Langkau"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seterusnya"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Sediakan wajah buka kunci"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Wajah buka kunci"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Anda tidak boleh menggunakan cap jari untuk membuka kunci peranti ini. Untuk mendapatkan maklumat lanjut, hubungi pentadbir organisasi anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tidak perlu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Langkau"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seterusnya"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Dengan melindungi tablet anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Dengan melindungi peranti anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Dengan melindungi telefon anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dengan melindungi tablet anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dengan melindungi peranti anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dengan melindungi telefon anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Langkau persediaan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Langkau persediaan kata laluan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Langkau persediaan corak?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Sediakan kaedah kunci skrin sandaran anda"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pilih kaedah kunci skrin sandaran anda"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Pilihan kunci skrin"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Pilihan kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kunci skrin"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Wajah buka kunci + Kata laluan"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Teruskan tanpa wajah buka kunci"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Anda boleh membuka kunci telefon menggunakan wajah. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik + Corak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik + Kata laluan"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Teruskan tanpa biometrik"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Anda boleh membuka kunci telefon anda menggunakan biometrik anda. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dlumpuhkn pentadbir, dsr penyulitan/storan bukti klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Leret"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Alamat MAC peranti"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Alamat MAC terawak"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Alamat IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Butiran rangkaian"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Tapisan subrangkaian"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Taipkan alamat gerbang yang sah."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Taipkan alamat DNS yang sah."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sila taip awalan rgkaian yg pjgnya antara 0 &amp; 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (melainkan dibatalkan oleh DNS Peribadi)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (melainkan dibatalkan oleh DNS Peribadi)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Get laluan"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Panjang awalan rangkaian"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Tetapkan sandaran wajah buka kunci"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Tetapkan sandaran wajah buka kunci"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Tetapkan sandaran wajah buka kunci"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Tetapkan sandaran buka kunci biometrik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Tetapkan corak untuk gunakan biometrik"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Tetapkan PIN untuk menggunakan biometrik"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Terlupa kata laluan anda?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Terlupa corak anda?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Terlupa nombor PIN anda?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Tidak disediakan - Profil kerja"</string>
     <string name="user_admin" msgid="4024553191395768119">"Pentadbir"</string>
     <string name="user_you" msgid="3070562015202859996">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nama samaran"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Anda boleh menambahkan sehingga <xliff:g id="USER_COUNT">%1$d</xliff:g> pengguna"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Hanya pemilik tablet boleh menguruskan pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Hanya pemilik telefon boleh menguruskan pengguna."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Kembali"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seterusnya"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Selesai"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ambil foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pilih imej"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pilih foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kad SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kad SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta corak sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan termasuk penggera sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta PIN anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta corak anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta kata laluan anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Tidak"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Terhad"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia apabila disambungkan ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Lihat lagi"</string>
     <string name="see_less" msgid="2642392725363552793">"Lihat kurang"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Matikan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Matikan SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Mematikan SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Tidak dapat melumpuhkan pembawa"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kesilapan telah berlaku dan pembawa anda tidak dapat dilumpuhkan."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Sambung ke peranti"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Apl <xliff:g id="APPNAME">%1$s</xliff:g> mahu menggunakan rangkaian Wi-Fi sementara untuk menyambung ke peranti anda"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Tiada peranti ditemui. Pastikan peranti dihidupkan dan tersedia untuk menyambung."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index aba4fe5..e4b58d3 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ဖုန်းမျက်နှာပြင် လော့ခ်၊ မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ဖန်သားပြင် လော့ခ်ချခြင်း၊ လက်ဗွေ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"သင့်ဖုန်းကို မျက်နှာ၊ လက်ဗွေတို့ဖြင့် လုံခြုံစွာဖွင့်လိုက်ပါ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"အက်ပ်များသို့လက်မှတ်ထိုးဝင်ပြီး ပေးချေမှုကို အတည်ပြုနိုင်သည်"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"လော့ခ်ဖွင့်ခြင်း သတ်မှတ်ရန်-"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ဖုန်းကို အလွယ်ဖွင့်ရန်"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"လက်ဗွေ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"အိပ်ထဲ၌ ဖုန်းလော့ခ်ပွင့်ချိန် ချွေတာရန်"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ကျော်ရန်"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ရှေ့သို့"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"မျက်နှာ ထည့်သွင်းပြီး"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း ထည့်သွင်းပါ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်လက်ဗွေကို အသုံးမပြုနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ်တို့လောက် လုံခြုံမှုမရှိပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"မလုပ်တော့"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"မလိုပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ဆက်လုပ်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ကျော်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ရှေ့သို့"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤတက်ဘလက်ကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"သင့်ဖုန်း ဖန်သားပြင်သော့စနစ်အား သတ်မှတ်ပါ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"အရန်ဖန်သားပြင်လော့ခ် နည်းလမ်းတစ်ခု ရွေးချယ်ပါ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း + စကားဝှက်"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းမပါဘဲ ရှေ့ဆက်ရန်"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"သင့်မျက်နှာကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက အရန်မျက်နှာပြင်လော့ခ်တစ်ခု လိုအပ်ပါသည်။"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပုံစံ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပင်နံပါတ်"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + စကားဝှက်"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"စီမံခန့်ခွဲသူ၊ အသွင်ဝှက်ခြင်း မူဝါဒ သို့မဟုတ် အထောက်အထား သိုလှောင်ခန်းက ပိတ်ထားပါသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"မရှိ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ပွတ်ဆွဲရန်"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"စက်ပစ္စည်း MAC လိပ်စာ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ကျပန်းလုပ်ထားသည့် MAC လိပ်စာ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"အိုင်ပီလိပ်စာ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ကွန်ရက် အသေးစိတ်များ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet ကွင်းဆက်နံပါတ်"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ခိုင်လုံသောဝင်ပေါက် (gateway)လိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ခိုင်လုံသော DNS လိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"၀နှင့်၃၂အရှည်ရှိသော ကွန်ယက်အစပြုနံပတ်ကိုထည့်ပါ"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (သီးသန့် DNS အစားထိုးခြင်း မရှိပါက)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (သီးသန့် DNS အစားထိုးခြင်း မရှိပါက)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ဝင်ပေါက် (gateway)"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ကွန်ရက် အစပြုဂဏန်း၏အရှည်"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"တိုက်ရိုက် Wi-Fi"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"မျက်နှာမှတ် သော့ဖွင့်ရန် စကားဝှက်ထည့်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပုံစံသတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပင်နံပါတ်ထည့်ပါ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝအချက်များသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝအချက်များသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝအချက်များသုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"စကားဝှက် မေ့နေပါလား။"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ပုံစံ မေ့နေပါသလား။"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ပင်နံပါတ် မေ့နေပါသလား။"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"အလုပ် ပရိုဖိုင် - မသတ်မှတ်ရသေး"</string>
     <string name="user_admin" msgid="4024553191395768119">"စီမံခန့်ခွဲသူ"</string>
     <string name="user_you" msgid="3070562015202859996">"သင် (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"နာမည်ဝှက်"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"သင် အသုံးပြုသူ <xliff:g id="USER_COUNT">%1$d</xliff:g> ယောက်အထိ ပေါင်းထည့်နိုင်သည်။"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"တက်ဘလက်၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ဖုန်း၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"နောက်သို့"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ရှေ့သို့"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ပြီးပြီ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ဓာတ်ပုံရိုက်ရန်"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ပုံရွေးရန်"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ဓာတ်ပုံ ရွေးရန်"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ဆင်းမ် ကဒ်များ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ဆင်းမ် ကဒ်များ"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ လော့ခ်ဖွင့်ပုံစံ တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် လော့ခ်ဖွင့်ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ကန့်သတ်ထားသည်"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> တွင် ချိတ်ဆက်ထားသည့်အခါ မရနိုင်ပါ"</string>
     <string name="see_more" msgid="7499355691042812723">"ပိုပြရန်"</string>
     <string name="see_less" msgid="2642392725363552793">"လျှော့ ကြည့်ရန်"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ပိတ်မလား။"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"\'ဆင်းမ်ကဒ်\' ပိတ်မလား။"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"\'ဆင်းမ်ကဒ်\' ပိတ်နေသည်<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ဝန်ဆောင်မှုပေးသူကို ပိတ်မရပါ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"တစ်ခုခုမှားယွင်းသွားပါ၍ သင့်ဝန်ဆောင်မှုပေးသူကို ပိတ်မရခဲ့ပါ။"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"စက်နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"သင့်စက်နှင့် ချိတ်ဆက်ရန် <xliff:g id="APPNAME">%1$s</xliff:g> အက်ပ်က ယာယီ Wi‑Fi ကွန်ရက်ကို အသုံးပြုလိုသည်"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"မည်သည့်စက်မျှ မတွေ့ပါ။ စက်များဖွင့်ထားပြီး ချိတ်ဆက်နိုင်ခြင်း ရှိမရှိ စစ်ဆေးပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bb76673..739d4a0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjermlås, ansiktslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjermlås, fingeravtrykk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skjermlås"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sikker opplåsing av telefonen med ansikt og fingeravtrykk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Du kan også logge på apper og bekrefte betalinger"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfigurer opplåsing med:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ansiktslås"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Gjør det enkelt å låse opp telefonen"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingeravtrykk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Lås opp telefonen raskt i lommen"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Hopp over"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Neste"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ansiktet er lagt til"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfigurer ansiktslås"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ansiktslås"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Du kan ikke bruke fingeravtrykk til å låse opp denne enheten. Ta kontakt med administratoren for organisasjonen din for mer informasjon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn sterke mønstre eller PIN-koder."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei takk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Hopp over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Neste"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Når du beskytter nettbrettet ditt med et alternativ for skjermlås, kan ingen andre bruke det hvis det blir stjålet eller du mister det. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Når du beskytter enheten din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Når du beskytter telefonen din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Når du beskytter nettbrettet ditt med et alternativ for skjermlås, kan ingen andre bruke det hvis det blir stjålet eller du mister det. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Når du beskytter enheten med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Når du beskytter telefonen din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vil du hoppe over konfigurering av PIN-nummer?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vil du hoppe over konfigurering av passord?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vil du hoppe over konfigurering av mønster?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Konfigurer låsemetoden for bakgrunnsskjermen din"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Velg hva slags reserveskjermlås du vil bruke"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Alternativer for skjermlås"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Alternativer for skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skjermlås"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ansiktslås + passord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Fortsett uten Ansiktslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse opp telefonen med ansiktet. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometri + mønster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometri + PIN-kode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometri + passord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Fortsett uten biometri"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kan låse opp telefonen med biometri. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Avslått av admin, krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Sveip"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhetens MAC-adresse"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tilfeldig valgt MAC-adresse"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Nettverksdetaljer"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Nettverksmaske"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Angi en gyldig gateway-adresse."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Angi en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Angi lengde for nettverksprefiks mellom 0 og 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (med mindre det overstyres av privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (med mindre det overstyres av privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Nettverksprefiks-lengde"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"For å bruke Ansiktslås, angi et passord"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"For å bruke Ansiktslås, angi et mønster"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"For å bruke Ansiktslås, angi en PIN-kode"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Angi et passord for å bruke biometri"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Angi et mønster for å bruke biometri"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Angi en PIN-kode for å bruke biometri"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glemt passordet ditt?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glemt mønsteret ditt?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glemt PIN-koden din?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ikke konfigurert – arbeidsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Kallenavn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan legge til opptil <xliff:g id="USER_COUNT">%1$d</xliff:g> brukere"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Bare eieren av nettbrettet kan administrere brukere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Bare eieren av telefonen kan administrere brukere."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tilbake"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Neste"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fullfør"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ta et bilde"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Velg et bilde"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Velg bildet"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om PIN-koden din ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-koden for å starte enheten?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om mønsteret ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønsteret for å starte enheten?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om passord ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passordet for å starte enheten?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om PIN-koden din ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-koden for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om mønsteret ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønsteret for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om passordet ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passordet for å starte enheten?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begrenset"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgjengelig når du er koblet til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Se flere"</string>
     <string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du slå av <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du slå av SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slår av SIM-kort <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan ikke slå av operatøren"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noe gikk galt, og enheten kunne ikke slå av operatøren."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Koble til enheten"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil bruke et midlertidig Wi-Fi-nettverk for å koble til enheten din"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Fant ingen enheter. Sørg for at enhetene er slått på og tilgjengelige for tilkobling."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 72ced3f..a0ed0c5 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रिन लक, फेस अनलक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रिन लक, फिंगरप्रिन्ट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रिन लक"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"अनुहार तथा फिंगरप्रिन्ट प्रयोग गरी आफ्नो फोन अनलक गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"तपाईं एपमा साइन इन गर्न र भुक्तानी पुष्टि गर्न पनि सक्नुहुन्छ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"यसमार्फत अनलक सेटअप गर्नुहोस्:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"फेस अनलक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"सहज तरिकाले आफ्नो फोन अनलक गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फिंगरप्रिन्ट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"खल्तीमै फोन अनलक गरी समय बचत गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"स्किप गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"अर्को"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"अनुहार थपियो"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"फेस अनलक सेटअप गर्नुहोस्"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"फेस अनलक"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना फिंगरप्रिन्टहरूको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो फिंगरप्रिन्टको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द गर्नुहोस्"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"पर्दैन, धन्यवाद"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी राख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"छोड्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"अर्को"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त ट्याब्लेट हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त यन्त्र हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त फोन हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी ट्याब्लेट सुरक्षित गरिएका खण्डमा ट्याब्लेट हराएमा वा चोरी भएमा कसैले पनि उक्त ट्याब्लेट प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी यन्त्र सुरक्षित गरिएका खण्डमा उक्त यन्त्र हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी फोन सुरक्षित गरिएका खण्डमा फोन हराएमा वा चोरी भएमा कसैले पनि उक्त फोन प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN सेटअप गर्न छाड्ने हो?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड सेटअप गर्न छाड्ने हो?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ढाँचा सेटअप गर्न छाड्ने हो?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो ट्याब्लेट प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"तपाईँको ब्याकअप स्क्रिन लक विधि सेटअप गर्नुहोस्"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"आफ्नो यन्त्रको स्क्रिन लक गर्ने वैकल्पिक विधि छनौट गर्नुहोस्"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रिन लकका विकल्पहरू"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रिन लकका विकल्पहरू"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रिन लक"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"फेस अनलक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"फेस अनलक सुविधा सेट अप नगरी अगाडि बढ्नुहोस्"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"तपाईं आफ्नो अनुहारको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक्स + ढाँचा"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक्स + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक्स + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक्स प्रयोग नगरिकनै जारी राख्नुहोस्"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"तपाईं आफ्नो बायोमेट्रिक्स प्रयोग गरेर आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक भण्डारणद्वारा असक्षम पारिएको छ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप गर्नुहोस्"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"यन्त्रको MAC ठेगाना"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"अनियमित बनाइएको MAC ठेगाना"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ठेगाना"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्कको विवरण"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"एउटा मान्य गेटवे ठेगाना टाइप गर्नुहोस्।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"एउटा मान्य DNS ठेगाना टाइप गर्नुहोस्।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"नेटवर्क प्रेफिक्सको लम्बाइ ० देखि ३२का बीच टाइप गर्नुहोस्।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (निजी DNS ले ओभरराइड नगरुन्जेल)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (निजी DNS ले ओभरराइड नगरुन्जेल))"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लम्बाइ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"फेस अनलक प्रयोग गर्न पासवर्ड सेट गर्नु…"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"फेस अनलक प्रयोग गर्न प्याटर्न सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"फेस अनलक प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"बायोमेट्रिक्स प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"बायोमेट्रिक्स प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"बायोमेट्रिक्स प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"आफ्नो पासवर्ड बिर्सनुभयो?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"आफ्नो ढाँचा बिर्सनुभयो?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"आफ्नो PIN बिर्सनुभयो?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट भएको छैन - कार्य प्रोफाइल"</string>
     <string name="user_admin" msgid="4024553191395768119">"प्रशासक"</string>
     <string name="user_you" msgid="3070562015202859996">"तपाईं (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"उपनाम"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"तपाईँले <xliff:g id="USER_COUNT">%1$d</xliff:g> जना प्रयोगकर्ता सम्म थप्न सक्नुहुनेछ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ट्याब्लेटको मालिकले मात्र प्रयोगकर्ताहरूलाई व्यवस्थापन गर्न सक्छ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवल फोनको धनीले मात्र प्रयोगकर्ता व्यवस्थापन गर्न सक्छ"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"पछाडि जानुहोस्"</string>
     <string name="wizard_next" msgid="3884832431439072471">"अर्को"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"समाप्त गर्नुहोस्"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फोटो खिच्नुहोस्"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"कुनै फोटो छनौट गर्नुहोस्"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फोटो छान्नुहोस्"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM कार्डहरू"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि PIN चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो ढाँचा चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि ढाँचा चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि पासवर्ड चाहिने बनाउने हो?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो PIN हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN हाल्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो ढाँचा हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न ढाँचा हाल्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड हाल्नु पर्ने बनाउने हो?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"हो"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"होइन"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"प्रतिबन्धित"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
     <string name="see_more" msgid="7499355691042812723">"थप हेर्नुहोस्"</string>
     <string name="see_less" msgid="2642392725363552793">"कम हेर्नुहोस्"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अफ गर्ने हो?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM अफ गर्ने हो?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM अफ गरिँदै<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"केही चिज गडबड भयो र तपाईंको मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"यन्त्रमा कनेक्ट गरियोस्"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> एप तपाईंको यन्त्रमा कनेक्ट हुन कुनै अस्थायी Wi‑Fi नेटवर्क प्रयोग गर्न चाहन्छ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"कुनै पनि यन्त्र फेला परेन। यन्त्रहरू सक्रिय हुनुका साथै जडान गर्नका लागि उपलब्ध भएको कुरा सुनिश्चित गर्नुहोस्।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6bbcdd5..b804e10 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Schermvergrendeling, ontgrendelen via gezichtsherkenning"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Schermvergrendeling, vingerafdruk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Schermvergrendeling"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ontgrendel je telefoon veilig met je gezicht en vingerafdruk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Je kunt ook inloggen bij apps en betalingen bevestigen"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ontgrendelen instellen met:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ontgrendelen via gezichtsherkenning"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefoon ontgrendelen makkelijker maken"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vingerafdruk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefoon ontgrendelen in je broekzak"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Overslaan"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Volgende"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gezicht toegevoegd"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ontgrendelen via gezichtsherkenning instellen"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ontgrendelen via gezichtsherkenning"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je kunt je vingerafdruk niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuleren"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Doorgaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Overslaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Als je je tablet beveiligt met een schermvergrendelingsoptie, kan niemand de tablet gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Als je je apparaat beveiligt met een schermvergrendelingsoptie, kan niemand het apparaat gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Als je je telefoon beveiligt met een schermvergrendelingsoptie, kan niemand de telefoon gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Als je je tablet beveiligt met een schermvergrendelingsoptie, kan niemand de tablet gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Als je je apparaat beveiligt met een schermvergrendelingsoptie, kan niemand het apparaat gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Als je je telefoon beveiligt met een schermvergrendelingsoptie, kan niemand de telefoon gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Instellen pincode overslaan?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Instellen van wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Instellen patroon overslaan?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Je achterliggende schermvergrendelingsmethode instellen"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Kies je back-upmethode voor schermvergrendeling"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Schermvergrendelingsopties"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Schermvergrendelingsopties"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Schermvergrendeling"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ontgrendelen via gezichtsherkenning + wachtwoord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Doorgaan zonder ontgrendelen via gezichtsherkenning"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Je kunt je telefoon ontgrendelen met je gezicht. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrische systemen + patroon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrische systemen + pincode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrische systemen + wachtwoord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Doorgaan zonder biometrische systemen"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Je kunt je telefoon ontgrendelen met je biometrische gegevens. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Uitgeschakeld door beheerder, versleutelingsbeleid of opslag certificaatgegevens"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipen"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-adres van apparaat"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Willekeurig MAC-adres"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adres"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netwerkgegevens"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetmasker"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Voer een geldig gateway-adres in."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Voer een geldig DNS-adres in."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Typ een netwerkprefix van 0-32 tekens."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tenzij overschreven door privé-DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tenzij overschreven door privé-DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengte van netwerkprefix"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wifi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Stel wachtwoord in voor ontgrendelen via gezichtsherkenning"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Stel patroon in voor ontgrendelen via gezichtsherkenning"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Stel pincode in voor ontgrendelen via gezichtsherkenning"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Wachtwoord instellen voor biometrie"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Patroon instellen voor biometrie"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Pincode instellen voor biometrie"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Je wachtwoord vergeten?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Je patroon vergeten?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Je pincode vergeten?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Niet ingesteld - Werkprofiel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Beheerder"</string>
     <string name="user_you" msgid="3070562015202859996">"Jij (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Bijnaam"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Je kunt maximaal <xliff:g id="USER_COUNT">%1$d</xliff:g> gebruikers toevoegen"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Alleen de eigenaar van de tablet kan gebruikers beheren."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Alleen de eigenaar van de telefoon kan gebruikers beheren."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Terug"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Volgende"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Voltooien"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Een foto maken"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Een afbeelding kiezen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto selecteren"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Simkaarten"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Simkaarten"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat op te starten?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat op te starten?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een wachtwoord vereist is om het apparaat op te starten?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nee"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Beperkt"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niet beschikbaar wanneer verbonden met <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Meer bekijken"</string>
     <string name="see_less" msgid="2642392725363552793">"Minder weergeven"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> uitschakelen?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Simkaart uitschakelen?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Simkaart uitschakelen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Kan provider niet uitschakelen"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Er is iets misgegaan. Je provider kan niet worden uitgeschakeld."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Verbinding maken met apparaat"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"De app <xliff:g id="APPNAME">%1$s</xliff:g> wil een tijdelijk wifi-netwerk gebruiken om verbinding te maken met je apparaat."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Geen apparaten gevonden. Zorg dat apparaten zijn ingeschakeld en beschikbaar zijn voor verbinding."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 05bc6db..78ad73f 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ସ୍କ୍ରିନ୍‍ ଲକ୍‌, ଫେସ୍‌ ଅନ୍‌ଲକ୍‌"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌, ଟିପଚିହ୍ନ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ଆପଣଙ୍କ ଚେହେରା ଓ ଟିପଚିହ୍ନ ସହ ନିଜର ଫୋନକୁ ସୁରକ୍ଷିତ ଭାବେ ଅନଲକ କର"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ଆପଣ ଆପ୍ସରେ ସାଇନ୍ ଇନ୍ କରି ପେମେଣ୍ଟ ମଧ୍ୟ ସୁନିଶ୍ଚିତ କରିପାରିବେ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ଏହା ସହ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ଫେସ୍ ଅନଲକ୍"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ଆପଣଙ୍କ ଫୋନ୍ ଅନଲକ୍ କରିବା ସହଜ କରନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ଟିପଚିହ୍ନ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ଆପଣଙ୍କ ପକେଟରେ ଫୋନ ଅନଲକ କରି ସମୟ ବଞ୍ଚାନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ପରବର୍ତ୍ତୀ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ଫେସ୍‌ ଯୋଡ଼ାଗଲା"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ଫେସ୍ ଅନ୍‌ଲକ୍"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନର ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଏହି ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ଫୋନ୍‌କୁ ଅନଲକ୍‌ କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଜଟିଳ ପାଟର୍ନ କିମ୍ୱା ପିନ୍‌ ତୁଳନାରେ ଆପଣଙ୍କର ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"କ୍ୟାନ୍ସଲ୍‌"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ନା, ଧନ୍ୟବାଦ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ଜାରି ରଖ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ଛାଡିଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ପରବର୍ତ୍ତୀ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‍କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଫୋନ୍‌କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋ‍ଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଟାବଲେଟକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଫୋନକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN ସେଟ୍‌ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ପାସ୍‌ୱାର୍ଡ ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ପାଟର୍ନ ସେଟ୍‌ଅପ୍‌କୁ ବାଦ୍ ଦେବେ କି?"</string>
@@ -532,8 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ଡିଭାଇସ୍‌ର ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରି ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହି ଟାବ୍‌ଲେଟ୍‌କୁ ଅନ୍ୟମାନେ ବ୍ୟବହାର କରିବାରୁ ପ୍ରତିରୋଧ କରନ୍ତୁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛନ୍ତୁ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ଡିଭାଇସ୍‌ ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରି, ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହାକୁ ବ୍ୟବହାର କରିବାରୁ ଅନ୍ୟମାନଙ୍କୁ ରୋକନ୍ତୁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛନ୍ତୁ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ଡିଭାଇସ୍‌ର ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହି ଫୋନକୁ ଅନ୍ୟମାନେ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛି ନିଅନ୍ତୁ।"</string>
-    <!-- no translation found for lock_settings_picker_biometric_message (2609666443527262781) -->
-    <skip />
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ଆପଣଙ୍କ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ବିକଳ୍ପ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ବିକଳ୍ପ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌"</string>
@@ -565,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ଫେସ୍ ଅନ୍‌ଲକ୍ + ପାସ୍‌ୱାର୍ଡ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ବିନା ଫେସ୍ ଅନ୍‌ଲକ୍‌ରେ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ନିଜର ଫେସ୍‍ ବ୍ୟବହାର କରି ନିଜର ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ବାୟୋମେଟ୍ରିକ୍ସ + ପାଟର୍ନ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ବାୟୋମେଟ୍ରିକ୍ସ + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ବାୟୋମେଟ୍ରିକ୍ସ + ପାସୱାର୍ଡ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ବାୟୋମେଟ୍ରିକ୍ସ ବିନା ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ଆପଣ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ କରିପାରିବେ। ସୁରକ୍ଷା ପାଇଁ, ଏହି ବିକଳ୍ପ ଏକ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ କରେ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ପ୍ରଶାସକ, ଏନକ୍ରିପ୍‌ଶନ୍‌ ନୀତି, କିମ୍ବା କ୍ରେଡେନ୍‌ଶିଆଲ୍‌ ଷ୍ଟୋରେଜ୍‌ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"କିଛି ନାହିଁ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ସ୍ୱାଇପ୍"</string>
@@ -1032,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ଡିଭାଇସ୍‌ର MAC ଠିକଣା"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ରେଣ୍ଡମାଇଜ୍ ହୋଇଥିବା MAC ଠିକଣା"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ଠିକଣା"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ନେଟୱାର୍କ୍ ବିବରଣୀ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ସବ୍‌ନେଟ୍‌ ମାସ୍କ"</string>
@@ -1049,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ଏକ ମାନ୍ୟ ଗେଟ୍‌ୱେ ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ଏକ ବୈଧ DNS ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ଓ 32 ମଧ୍ୟରେ ଏକ ନେଟୱାର୍କ ପ୍ରିଫିକ୍ସ ଦୌର୍ଘ୍ୟ ଟାଇପ୍‌ କରନ୍ତୁ।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ବ୍ୟକ୍ତିଗତ DNS ଦ୍ୱାରା ଓଭରରିଡେନ୍ ହୋଇନଥିଲେ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ବ୍ୟକ୍ତିଗତ DNS ଦ୍ୱାରା ଓଭରରିଡେନ୍ ହୋଇନଥିଲେ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ଗେଟ୍‌ୱେ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ନେଟୱାର୍କ ପ୍ରିଫିକ୍ସ ଦୈର୍ଘ୍ୟ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ"</string>
@@ -1814,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପାସ୍‌ୱାର୍ଡ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପାଟର୍ନ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ଫେସ୍ ଅନ୍‍ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପିନ୍ ସେଟ୍ କରନ୍ତୁ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ ବ୍ୟାକଅପ ସେଟ୍ କର"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ ପାଟର୍ନ ସେଟ୍ କର"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ PIN ସେଟ୍ କର"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ଆପଣଙ୍କ ପାସୱାର୍ଡ ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ପାଟର୍ନ ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
@@ -1992,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ଆପ୍‌ ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"ଯଦି ଆପଣ ଏହି ଆପ୍‌କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତି, ତେବେ Android ଓ ଅନ୍ୟାନ୍ୟ ଆପ୍ସ ଆଉ କାମ ନକରିପାରେ। ମନେ ରଖନ୍ତୁ, ଯେହେତୁ ଏହା ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ପୂର୍ବରୁ-ଇନ୍‌ଷ୍ଟଲ୍ ଅଛି, ତେଣୁ ଆପଣ ଏହି ଆପ୍‌କୁ ଡିଲିଟ୍ କରିପାରିବେ ନାହିଁ। ଏହାକୁ ଅକ୍ଷମ କରି, ଏହି ଆପ୍‌କୁ ଆପଣ ବନ୍ଦ କରିବେ ଏବଂ ଆପଣଙ୍କର ଡିଭାଇସ୍‌ରେ ଲୁଚାଇବେ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ବନ୍ଦ କରିବେ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ଷ୍ଟୋର୍‌"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ଆପ୍‌ ବିବରଣୀ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ରୁ ଇନ୍‍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା ଆପ୍"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ଉପରେ ଅଧିକ ସୂଚନା"</string>
@@ -3052,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ସେଟ୍‌ ଅପ୍‌ ହୋଇନାହିଁ - କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌"</string>
     <string name="user_admin" msgid="4024553191395768119">"ଆଡ୍‌ମିନ୍‌"</string>
     <string name="user_you" msgid="3070562015202859996">"ଆପଣ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ଡାକନାମ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ଆପଣ <xliff:g id="USER_COUNT">%1$d</xliff:g> ଜଣ ପର୍ଯ୍ୟନ୍ତ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଡ଼ିପାରିବେ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"କେବଳ ଟାବ୍‌ଲେଟ୍‌ର ମାଲିକ ହିଁ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପରିଚାଳନା କରିପାରିବେ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"କେବଳ ଫୋନ୍‌ର ମାଲିକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ପରିଚାଳନା କରିପାରିବେ।"</string>
@@ -3172,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ପଶ୍ଚାତ୍"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ପରବର୍ତ୍ତୀ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ସମାପ୍ତ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ଗୋଟିଏ ଫଟୋ ଉଠାନ୍ତୁ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ଗୋଟିଏ ଛବି ବାଛନ୍ତୁ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ଫଟୋ ବାଛନ୍ତୁ:"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM କାର୍ଡ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ସିମ୍‌ କାର୍ଡଗୁଡ଼ିକ"</string>
@@ -3910,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପିନ୍‌ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ୍ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପିନ୍‌ ଦେବାକୁ ଚାହିଁବେ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପାଟର୍ନ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପାଟର୍ନ ଦେବାକୁ ଚାହିଁବେ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପାସ୍‌ୱାର୍ଡ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପାସ୍‌ୱାର୍ଡ ଦେବାକୁ ଚାହିଁବେ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ PIN ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜି ଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ PIN ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ଅନଲକ୍ କରିବା ପାଇଁ ଆପଣଙ୍କର ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହିତ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ ପାଟର୍ନ ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜିଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ପାଟର୍ନ ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହିତ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ ପାସୱାର୍ଡ ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜି ଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ପାସୱାର୍ଡ ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ହଁ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ନାଁ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ଅବରୋଧ କରାଯାଇଛି"</string>
@@ -4858,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
     <string name="see_more" msgid="7499355691042812723">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
     <string name="see_less" msgid="2642392725363552793">"କମ୍ ଦେଖନ୍ତୁ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ବନ୍ଦ କରିବେ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ବନ୍ଦ କରିବେ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ବନ୍ଦ କରାଯାଉଛି<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"କିଛି ତ୍ରୁଟି ହୋଇଥିବାରୁ ଆପଣଙ୍କ ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିଲା ନାହିଁ।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ଡିଭାଇସକୁୁ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ସଂଯୋଗ କରିବା ପାଇଁ <xliff:g id="APPNAME">%1$s</xliff:g> ଆପ୍ ଏକ ଅସ୍ଥାୟୀ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଛି"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"କୌଣସି ଡିଭାଇସ୍ ମିଳିଲା ନାହିଁ। ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ ଯେ ଡିଭାଇସ୍‍ ଚାଲୁ ହୋଇଛି ଏବଂ ସଂଯୋଗ କରିବା ପାଇଁ ଉପଲବ୍ଧ ଅଛି।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9d76bf1..a385f49 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ਸਕ੍ਰੀਨ ਲਾਕ, ਚਿਹਰਾ ਅਣਲਾਕ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ਸਕ੍ਰੀਨ ਲਾਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ਆਪਣੇ ਚਿਹਰੇ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਕੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਵੀ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ਇਸ ਦੇ ਨਾਲ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ਚਿਹਰਾ ਅਣਲਾਕ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨਾ ਸੌਖਾ ਬਣਾਓ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ਆਪਣੀ ਜੇਬ ਵਿੱਚ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਕੇ ਸਮਾਂ ਬਚਾਓ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ਛੱਡੋ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ਅੱਗੇ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ਚਿਹਰਾ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ਚਿਹਰਾ ਅਣਲਾਕ"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ਰੱਦ ਕਰੋ"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ਛੱਡੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ਅੱਗੇ"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ਕੀ ਪਿੰਨ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ਕੀ ਪਾਸਵਰਡ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ਕੀ ਪੈਟਰਨ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਵਿਧੀ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਧੀ ਚੁਣੋ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ਚਿਹਰਾ ਅਣਲਾਕ + ਪਾਸਵਰਡ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ਚਿਹਰਾ ਅਣਲਾਕ ਤੋਂ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪੈਟਰਨ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪਿੰਨ"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪਾਸਵਰਡ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੇ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ਤੁਸੀਂ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ਪ੍ਰਸ਼ਾਸਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੀਤੀ ਜਾਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ਸਵਾਈਪ ਕਰੋ"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ਡੀਵਾਈਸ MAC ਪਤਾ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ਬੇਤਰਤੀਬਵਾਰ MAC ਪਤਾ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ਪਤਾ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ਨੈੱਟਵਰਕ ਵੇਰਵੇ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਗੇਟਵੇ ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ DNS ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ਅਤੇ 32 ਦੇ ਵਿਚਕਾਰ ਇੱਕ ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ ਟਾਈਪ ਕਰੋ।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ਜਦੋਂ ਤੱਕ ਨਿੱਜੀ DNS ਵੱਲੋਂ ਓਵਰਰਾਈਡ ਨਾ ਕੀਤਾ ਗਿਆ ਹੋਵੇ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ਜਦੋਂ ਤੱਕ ਨਿੱਜੀ DNS ਵੱਲੋਂ ਓਵਰਰਾਈਡ ਨਾ ਕੀਤਾ ਗਿਆ ਹੋਵੇ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ਗੇਟਵੇ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ਕੀ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ਕੀ ਆਪਣਾ ਪੈਟਰਨ ਭੁੱਲ ਗਏ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ਕੀ ਆਪਣਾ ਪਿੰਨ ਭੁੱਲ ਗਏ?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤਾ - ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_admin" msgid="4024553191395768119">"ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="user_you" msgid="3070562015202859996">"ਤੁਸੀਂ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ਉਪਨਾਮ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ਕੇਵਲ ਟੈਬਲੈੱਟ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ਕੇਵਲ ਫ਼ੋਨ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ਪਿੱਛੇ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ਅੱਗੇ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ਚਿੱਤਰ ਚੁਣੋ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ਫ਼ੋਟੋ ਚੁਣੋ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ਕਾਰਡ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ਕਾਰਡ"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ਹਾਂ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ਨਹੀਂ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="see_more" msgid="7499355691042812723">"ਹੋਰ ਦੇਖੋ"</string>
     <string name="see_less" msgid="2642392725363552793">"ਘੱਟ ਵੇਖੋ"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ਕੀ ਸਿਮ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ਸਿਮ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ ਕਿਸੇ ਅਸਥਾਈ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ਕੋਈ ਡੀਵਾਈਸ ਨਹੀਂ ਮਿਲੇ। ਪੱਕਾ ਕਰੋ ਕਿ ਡੀਵਾਈਸ ਚਾਲੂ ਹਨ ਅਤੇ ਕਨੈਕਟ ਹੋਣ ਲਈ ਉਪਲਬਧ ਹਨ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5e3ec4e..22de5cd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blokada ekranu, rozpoznawanie twarzy"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blokada ekranu, odcisk palca"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blokada ekranu"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Bezpieczne odblokowywanie telefonu skanem twarzy i odciskiem palca"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Możesz też logować się do aplikacji i potwierdzać płatności"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Skonfiguruj metodę odblokowywania:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Rozpoznawanie twarzy"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Ułatw sobie odblokowywanie telefonu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Odcisk palca"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Szybko odblokowuj telefon w kieszeni"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pomiń"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Dodano twarz"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Skonfiguruj rozpoznawanie twarzy"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Rozpoznawanie twarzy"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: nie możesz odblokowywać tego urządzenia odciskiem palca. Więcej informacji uzyskasz od administratora swojej organizacji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: odcisk palca może być mniej bezpieczny niż skomplikowany wzór lub złożony kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anuluj"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, dziękuję"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pomiń"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalej"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Jeśli zabezpieczysz tablet blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Jeśli zabezpieczysz urządzenie blokadą ekranu i je zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Jeśli zabezpieczysz telefon blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Jeśli zabezpieczysz tablet blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Jeśli zabezpieczysz urządzenie blokadą ekranu i je zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Jeśli zabezpieczysz telefon blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pominąć konfigurację kodu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pominąć konfigurację hasła?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pominąć konfigurację wzoru?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Skonfiguruj dodatkową metodę blokowania ekranu"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Wybierz dodatkową metodę blokowania ekranu"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcje blokady ekranu"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcje blokady ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blokada ekranu"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Rozpoznawanie twarzy + hasło"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Kontynuuj bez rozpoznawania twarzy"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Możesz odblokować telefon za pomocą skanu twarzy. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria i wzór"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria i kod PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria i hasło"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Kontynuuj bez biometrii"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Możesz odblokować telefon, korzystając z systemu biometrycznego. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Przesuń palcem"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adres MAC urządzenia"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomizowany adres MAC"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adres IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Szczegóły sieci"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsieci"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Wpisz prawidłowy adres bramy."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Wpisz prawidłowy adres DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Wpisz długość przedrostka sieci z zakresu 0-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (chyba że zastąpiony przez prywatny DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (chyba że zastąpiony przez prywatny DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brama"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Długość przedrostka sieci"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Aby używać rozpoznawania twarzy, ustaw hasło"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Aby używać rozpoznawania twarzy, ustaw wzór"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Aby używać rozpoznawania twarzy, ustaw kod PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Aby korzystać z biometrii, ustaw hasło"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Aby korzystać z biometrii, ustaw wzór"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Aby korzystać z biometrii, ustaw kod PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Nie pamiętasz hasła?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Nie pamiętasz wzoru?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Nie pamiętasz kodu PIN?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nieskonfigurowany – profil służbowy"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ty (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonim"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Możesz dodać maksymalnie <xliff:g id="USER_COUNT">%1$d</xliff:g> użytkowników"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Użytkownikami może zarządzać tylko właściciel tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Użytkownikami może zarządzać tylko właściciel telefonu."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Wróć"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Zakończ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Zrób zdjęcie"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Wybierz obraz"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Wybierz zdjęcie"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Karty SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Karty SIM"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać kodu PIN do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać narysowania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać wzoru do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać kodu PIN do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać narysowania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać wzoru do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Tak"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nie"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Z ograniczeniami"</string>
@@ -4857,7 +4831,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Zezwól aplikacji na sterowanie Wi-Fi"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Zezwalaj tej aplikacji na włączanie i wyłączanie Wi-Fi, wyszukiwanie sieci Wi-Fi i łączenie się z nimi, dodawanie oraz usuwanie sieci i uruchamianie lokalnego hotspotu."</string>
     <string name="media_output_title" msgid="8283629315159510680">"Odtwarzaj multimedia na"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"Odtwórz <xliff:g id="LABEL">%s</xliff:g> na:"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"Odtwarzaj <xliff:g id="LABEL">%s</xliff:g> na:"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"To urządzenie"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"Telefon"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"Tablet"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niedostępne po połączeniu z siecią <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pokaż więcej"</string>
     <string name="see_less" msgid="2642392725363552793">"Pokaż mniej"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Wyłączyć usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Wyłączyć kartę SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Wyłączam kartę SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nie można wyłączyć operatora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Coś poszło nie tak i nie udało się wyłączyć operatora."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Połącz z urządzeniem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacja <xliff:g id="APPNAME">%1$s</xliff:g> chce użyć tymczasowej sieci Wi‑Fi, by połączyć się z Twoim urządzeniem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nie znaleziono urządzeń. Upewnij się, że urządzenia są włączone i mogą się połączyć."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a230ea7..96f13a4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de tela"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o smartphone com seu rosto ou impressão digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Você pode também fazer login em apps e confirmar pagamentos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Facilite o desbloqueio do smartphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueie o smartphone no seu bolso"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pular"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Próxima"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pular configuração de padrão?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configure seu método secundário de bloqueio de tela"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de tela"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de tela"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sem desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + Padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + Senha"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem a biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"É possível desbloquear o smartphone usando a biometria. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC randomizado"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digite um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digite um endereço de DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digite um tamanho do prefixo de rede entre 0 e 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que substituído por um DNS particular)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que substituído por um DNS particular)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tamanho do pref. de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina uma senha p/ usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina um padrão para usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina um PIN p/ usar o desb. facial"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar a biometria, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar a biometria, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar a biometria, defina um PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu sua senha?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu seu PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado - perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apelido"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> usuários"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Voltar"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Próxima"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Concluir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Chips"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Chips"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar um PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando seu padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajudar a proteger os dados em dispositivos perdidos ou roubados. Solicitar um padrão para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para ligar o dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um PIN antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um PIN para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um padrão antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um padrão para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo uma senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir uma senha para inicializar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrito"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar a operadora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"O app <xliff:g id="APPNAME">%1$s</xliff:g> quer usar uma rede Wi-Fi temporária para se conectar ao seu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo foi encontrado. Os dispositivos precisam estar ligados e disponíveis para conexão."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8c097df..cc2ebdd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de ecrã, Desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de ecrã, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de ecrã"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o telemóvel em segurança com o rosto e impressão digital."</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Também pode iniciar sessão em apps e confirmar o pagamento."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configure o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplifique o desbloqueio do telemóvel."</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Poupe tempo, desbloqueie o tlm no bolso."</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ignorar"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seguinte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado."</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configure o Desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o gestor da sua entidade."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Não, obrigado"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Se proteger o seu tablet com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Se proteger o seu dispositivo com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Se proteger o seu telemóvel com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Se proteger o seu tablet com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Se proteger o seu dispositivo com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Se proteger o seu telemóvel com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pretende ignorar a configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pretende ignorar configuração da palavra-passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pretende ignorar a configuração do padrão?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurar o seu método de bloqueio de ecrã em segundo plano"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha o método de bloqueio de ecrã de segurança."</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de ecrã"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de ecrã"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + palavra-passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue sem o Desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Pode desbloquear o telemóvel através do seu rosto. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + palavra-passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Pode desbloquear o seu telemóvel através da sua biometria. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo gestor, política de encriptação ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar rapidamente"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC aleatório"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduza um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduza um endereço DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduza um prefixo de rede com 0-32 caracteres."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (exceto se substituído por DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (exceto se substituído por DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Compr. do prefixo de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina pal.-pas. p/ Desbl. através Rosto"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina padrão p/ utilizar Desbl. Rosto"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina PIN para utilizar Desbloq. Rosto"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Defina a palavra-passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Defina o padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Defina o PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu-se da sua palavra-passe?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu-se do seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu-se do seu PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado – Perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"O utilizador (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudónimo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> utilizadores"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"A gestão dos utilizadores só pode ser feita pelo proprietário do tablet."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"A gestão dos utilizadores só pode ser feita pelo proprietário do telemóvel."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Anterior"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seguinte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartões SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartões SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu PIN antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu padrão antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu PIN antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Para além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu padrão antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrita"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando ligado a <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Pretende desativar o operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Pretende desativar o SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"A desativar o SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar o operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ocorreu um erro e não foi possível desativar o operador."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Estabeleça ligação ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A app <xliff:g id="APPNAME">%1$s</xliff:g> pretende utilizar uma rede Wi-Fi temporária para estabelecer ligação ao seu dispositivo."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo encontrado. Certifique-se de que os dispositivos estão ativados e disponíveis para ligação."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a230ea7..96f13a4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de tela"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o smartphone com seu rosto ou impressão digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Você pode também fazer login em apps e confirmar pagamentos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Facilite o desbloqueio do smartphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueie o smartphone no seu bolso"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pular"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Próxima"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pular configuração de padrão?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configure seu método secundário de bloqueio de tela"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de tela"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de tela"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sem desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + Padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + Senha"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem a biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"É possível desbloquear o smartphone usando a biometria. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC randomizado"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digite um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digite um endereço de DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digite um tamanho do prefixo de rede entre 0 e 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que substituído por um DNS particular)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que substituído por um DNS particular)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tamanho do pref. de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina uma senha p/ usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina um padrão para usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina um PIN p/ usar o desb. facial"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar a biometria, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar a biometria, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar a biometria, defina um PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu sua senha?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu seu PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado - perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apelido"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> usuários"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Voltar"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Próxima"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Concluir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Chips"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Chips"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar um PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando seu padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajudar a proteger os dados em dispositivos perdidos ou roubados. Solicitar um padrão para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para ligar o dispositivo?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um PIN antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um PIN para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um padrão antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um padrão para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo uma senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir uma senha para inicializar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrito"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Não é possível desativar a operadora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"O app <xliff:g id="APPNAME">%1$s</xliff:g> quer usar uma rede Wi-Fi temporária para se conectar ao seu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo foi encontrado. Os dispositivos precisam estar ligados e disponíveis para conexão."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 729d1a0..7d71169 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocarea ecranului, deblocare facială"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocarea ecranului, amprentă"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blocarea ecranului"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Deblocați în siguranță telefonul folosind fața și amprenta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Puteți să vă conectați la aplicații și să confirmați plata"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurați deblocarea cu:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Deblocare facială"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplificați deblocarea telefonului"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Amprentă"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Deblocați rapid telefonul din buzunar"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omiteți"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Înainte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Chip adăugat"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurați deblocarea facială"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Deblocare facială"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi amprenta ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulați"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nu, mulțumesc"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omiteți"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Înainte"</string>
@@ -458,12 +448,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Protejând tableta cu o opțiune de blocare a ecranului, nimeni nu va putea să o folosească dacă o pierdeți sau este furată. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Protejând dispozitivul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Protejând telefonul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dacă protejați tableta cu o opțiune de blocare a ecranului, nimeni nu va putea să o folosească dacă o pierdeți sau este furată. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dacă protejați dispozitivul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dacă protejați telefonul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Omiteți configurarea PIN-ului?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Omiteți configurarea parolei?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Omiteți configurarea modelului?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Configurați metoda de rezervă de blocare a ecranului"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Alegeți metoda de blocare a ecranului de backup"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opțiuni de blocare a ecranului"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opțiuni de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blocarea ecranului"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Deblocare facială + parolă"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuați fără deblocarea facială"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puteți debloca telefonul folosind chipul. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sisteme biometrice + Model"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sisteme biometrice + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sisteme biometrice + Parolă"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuați fără sisteme biometrice"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puteți debloca telefonul folosind sistemele biometrice. Pentru securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dezactivat de administrator, politica de criptare sau spațiul de stocare a certificatelor"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Glisare"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC a dispozitivului"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresă MAC aleatorie"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresă IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalii rețea"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mască de subrețea"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduceți o adresă gateway validă."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduceți o adresă DNS validă."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduceți prefix rețea din 0 – 32 caractere."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (dacă nu este înlocuit de un DNS privat)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (dacă nu este înlocuit de un DNS privat)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lungime prefix rețea"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1835,12 +1819,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Setați parola pentru deblocarea facială"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Setați modelul pentru deblocarea facială"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Setați parola pentru deblocarea facială"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Setați backupul de deblocare biometrică"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Setați backupul de deblocare biometrică"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Setați backupul de deblocare biometrică"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ați uitat parola?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ați uitat modelul?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ați uitat codul PIN?"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Neconfigurat – Profil de serviciu"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Dvs. (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonim"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puteți adăuga până la <xliff:g id="USER_COUNT">%1$d</xliff:g>   utilizatori"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Înapoi"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Înainte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizați"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Faceți o fotografie"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Alegeți o imagine"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selectați o fotografie"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Carduri SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Carduri SIM"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să se solicite un model pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să se solicite o parolă pentru a vă porni dispozitivul?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea codului PIN înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți codul PIN pentru a porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea modelului înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți modelul pentru a porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea parolei înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți parola pentru a porni dispozitivul?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nu"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricționată"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponibil când este conectat la <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Vedeți mai multe"</string>
     <string name="see_less" msgid="2642392725363552793">"Afișați mai puține"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Dezactivați <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Dezactivați SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Se dezactivează cardul SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Nu se poate dezactiva operatorul"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"A apărut o eroare și operatorul dvs. nu a putut fi dezactivat."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectați la dispozitiv"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplicația <xliff:g id="APPNAME">%1$s</xliff:g> vrea să folosească o rețea Wi-Fi temporară pentru a se conecta la dispozitiv"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nu s-au găsit dispozitive. Asigurați-vă că dispozitivele sunt pornite și gata de conectare."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dcf2b37..a7fc29e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокировка экрана, Фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокировка экрана, отпечаток пальца"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блокировка экрана"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Разблокировка с помощью фейсконтроля и отпечатков пальцев"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Вы также сможете входить в приложения и подтверждать оплату."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Выберите способ разблокировки:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Фейсконтроль"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Разблокировать телефон без лишних усилий"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Сканер отпечатков пальцев"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Разблокировать телефон не глядя"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропустить"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далее"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Изображение добавлено"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Настройте фейсконтроль"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Фейсконтроль"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nВнимание! Для разблокировки этого устройства сканер отпечатков использовать нельзя. За подробной информацией обратитесь к администратору."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nПомните, что защита с помощью отпечатков менее надежна, чем графический ключ или PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отмена"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Нет"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далее"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи планшета. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи устройства. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи телефона. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Для защиты своих данных в случае потери или кражи планшета выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Для защиты своих данных в случае потери или кражи устройства выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Для защиты своих данных в случае потери или кражи телефона выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Не устанавливать PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Не устанавливать пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Не устанавливать графический ключ?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Настройте дополнительный способ блокировки экрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Выберите запасной способ разблокировки экрана."</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Варианты блокировки экрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Варианты блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Блокировка экрана"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продолжить без использования функции \"Фейсконтроль\""</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Вы можете настроить разблокировку телефона с помощью распознавания лица. В целях безопасности вам нужно будет также установить дополнительный способ блокировки."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрия и графический ключ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрия и PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрия и пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продолжить без биометрии"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Вы можете настроить разблокировку телефона с помощью биометрии. В целях безопасности вам потребуется установить запасной способ разблокировки."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Запрещено администратором или иными правилами"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Провести по экрану"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адрес устройства"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Случайный MAC-адрес"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адрес"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Сведения о сети"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска подсети"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Введите действительный адрес шлюза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Введите действительный DNS-адрес."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Укажите длину префикса сети (от 0 до 32)."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (если не переопределен частным DNS-сервером)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (если не переопределен частным DNS-сервером)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Длина префикса сети"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Задайте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Задайте графический ключ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Задайте PIN-код"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Настройте запасной способ разблокировки"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Настройте запасной способ разблокировки"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Настройте запасной способ разблокировки"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забыли пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забыли графический ключ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забыли PIN-код?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Рабочий профиль не настроен"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдоним"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Вы можете добавить до <xliff:g id="USER_COUNT">%1$d</xliff:g> пользователей"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Только владелец может настроить устройство для других пользователей."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Только владелец может настроить устройство для других пользователей."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далее"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Готово"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сделать снимок"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Выбрать фото"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Выбрать фото."</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карты"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карты"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"На случай потери или кражи устройство можно дополнительно защитить PIN-кодом. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать PIN-код при запуске?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"На случай потери или кражи устройство можно дополнительно защитить графическим ключом. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать графический ключ при запуске?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"На случай потери или кражи устройство можно дополнительно защитить паролем. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать пароль при запуске?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос PIN-кода при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать PIN-код при запуске?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос графического ключа при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать графический ключ при запуске?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос пароля при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать пароль при запуске?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Нет"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ещё"</string>
     <string name="see_less" msgid="2642392725363552793">"Скрыть"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Отключить оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Отключить SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Отключение SIM-карты<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Произошла ошибка"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Не удалось отключить оператора."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Подключение к устройству"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Приложение \"<xliff:g id="APPNAME">%1$s</xliff:g>\" хочет использовать временную сеть Wi‑Fi для подключения к устройству."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Устройства не найдены. Убедитесь, что они включены и доступны для подключения."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 18ce700..a9b4279 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"උපාංග MAC ලිපිනය"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"සසම්භාවී MAC ලිපිනය"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ලිපිනය"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ජාල විස්තර"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"සබ්නෙට් මාස්ක්"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"වලංගු වාහල ලිපිනයක් ටයිප් කරන්න."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"වලංගු DNS ලිපිනයක් ටයිප් කරන්න."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ත් 32 අතර දිගින් යුත් ජාල උපසර්ගයක් ටයිප් කරන්න."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (පුද්ගලික DNS මගින් ප්‍රතික්ෂේප කරන්නේ නම් මිස)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (පුද්ගලික DNS මගින් ප්‍රතික්ෂේප කරන්නේ නම් මිස)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"වාහල"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ජාල උපසර්ගයේ දිග"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"සකස් කර නොමැත - වැඩකරන පැතිකඩ"</string>
     <string name="user_admin" msgid="4024553191395768119">"පරිපාලක"</string>
     <string name="user_you" msgid="3070562015202859996">"ඔබ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"අපනාමය"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ඔබට පරිශීලකයන් <xliff:g id="USER_COUNT">%1$d</xliff:g> ක් දක්වා එක් කළ හැකිය"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ටැබ්ලටයේ හිමිකරුට පමණක් පරිශීලකයින් කළමනාකරණය කළ හැක."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"දුරකථනයේ හිමිකරුට පමණක් පරිශීලකයින් කළමනාකරණය කළ හැක."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ආපසු"</string>
     <string name="wizard_next" msgid="3884832431439072471">"මීලඟ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"අවසන් කරන්න"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ඡායාරූපයක් ගන්න"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"රූපයක් තෝරන්න"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ඡායාරූපය තෝරන්න"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM කාඩ් පත්"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM කාඩ් පත්"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> වෙත සම්බන්ධ වූ විට නොමැත"</string>
     <string name="see_more" msgid="7499355691042812723">"තව බලන්න"</string>
     <string name="see_less" msgid="2642392725363552793">"අඩුවෙන් බලන්න"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ක්‍රියාවිරහිත කරමින්<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"වාහකය අබල කළ නොහැකිය"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"යම් දෙයක් වැරදී ගිය අතර ඔබේ වාහකය අබල කළ නොහැකි විය."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"උපාංගයට සම්බන්ධ වන්න"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> යෙදුමට ඔබේ උපාංගයට සම්බන්ධ වීමට තාවකාලික Wi‑Fi ජාලයක් භාවිත කිරීමට අවශ්‍යය"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"උපාංග කිසිවක් හමු නොවිය. උපාංග සක්‍රීය කර තිබෙන අතර සම්බන්ධ කිරීමට ලද හැකි බව තහවුරු කර ගන්න."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ea97b09..49bbde4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámka obrazovky, odomknutie tvárou"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámka obrazovky, odtlačok prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zámka obrazovky"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Bezpečné odomykanie telefónu tvárou a odtlačkom prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Môžete sa tiež prihlasovať v aplikáciách a potvrdzovať platby"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastaviť odomykanie pomocou:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odomknutie tvárou"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Zjednodušte si odomykanie telefónu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Odtlačok prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Šetrite čas odomknutím telefónu vo vrecku"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskočiť"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Ďalej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Pridaná tvár"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastaviť odomknutie tvárou"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odomknutie tvárou"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Toto zariadenie nemôžete odomykať pomocou odtlačku prsta. Ďalšie informácie vám poskytne správca organizácie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo kód PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušiť"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, vďaka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovať"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskočiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Ďalej"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Keď zabezpečíte svoj tablet pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Keď zabezpečíte svoje zariadenie pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Keď zabezpečíte svoj telefón pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Keď zabezpečíte svoj tablet pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Keď zabezpečíte svoje zariadenie pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Keď zabezpečíte svoj telefón pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Chcete preskočiť nastavenie kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Chcete preskočiť nastavenie hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Chcete preskočiť nastavenie vzoru?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Nastavte dodatočnú metódu zámky obrazovky"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zvoľte spôsob aktivovania dodatočnej zámky obrazovky"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zámky obrazovky"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zámky obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zámka obrazovky"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odomknutie tvárou a heslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Pokračovať bez odomknutia tvárou"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefón môžete odomknúť pomocou tváre. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria a vzor"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria a PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria a heslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Pokračovať bez biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefón môžete odomknúť pomocou biometrie. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Žiadna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Potiahnutie"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC zariadenia"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomizovaná adresa MAC"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresa IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podrobnosti siete"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsiete"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Zadajte platnú adresu brány."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Zadajte platnú adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Zadajte dĺžku sieťovej predpony v rozsahu 0 až 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"Server DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"Server DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"1. systém DNS (pokiaľ nie je prepísaný súkromným)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"2. systém DNS (pokiaľ nie je prepísaný súkromným)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dĺžka sieťovej predpony"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ak chcete použiť odomknutie tvárou, nastavte heslo"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ak chcete použiť odomknutie tvárou, nastavte vzor"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Ak chcete použiť odomknutie tvárou, nastavte PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometria vyžaduje nastavenie hesla"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometria vyžaduje nastavenie vzoru"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometria vyžaduje nastavenie kódu PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zabudli ste heslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zabudli ste vzor?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zabudli ste PIN?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Pracovný profil (nie je nastavený)"</string>
     <string name="user_admin" msgid="4024553191395768119">"Správca"</string>
     <string name="user_you" msgid="3070562015202859996">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Prezývka"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Môžete pridať až <xliff:g id="USER_COUNT">%1$d</xliff:g> používateľov"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Používateľov môže spravovať iba vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Používateľov môže spravovať iba vlastník telefónu."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Späť"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Ďalej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončiť"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Odfotiť"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vybrať obrázok"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vybrať fotku"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM karty"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM karty"</string>
@@ -4001,7 +3978,7 @@
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pred odopnutím požiadať o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Pred uvoľnením požiadať o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"Pri odopnutí zamknúť zariadenie"</string>
-    <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Potvrdenie odstránenia SIM karty"</string>
+    <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Potvrdiť odstránenie SIM karty"</string>
     <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"Pred vymazaním stiahnutej SIM karty overiť, že ste to vy"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="2633920317425356619">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Okrem odomknutia pomocou biometrie môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Okrem odomknutia pomocou biometrie môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Okrem odomknutia pomocou biometrie môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Áno"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nie"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Obmedzené"</string>
@@ -4985,7 +4959,7 @@
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Názov"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Farba (používajú kompatibilné aplikácie)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"Uložiť"</string>
-    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Použiť SIM"</string>
+    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Používať SIM kartu"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Vypnuté"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Ak chcete túto SIM kartu deaktivovať, odstráňte ju"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Klepnutím aktivujete operátora <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nie je k dispozícii pri pripojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Zobraziť viac"</string>
     <string name="see_less" msgid="2642392725363552793">"Zobraziť menej"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Chcete vypnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Chcete vypnúť SIM kartu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypína sa SIM karta<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operátor sa nedá deaktivovať"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Vyskytol sa problém a operátora sa nepodarilo deaktivovať."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Pripojenie k zariadeniu"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> chce použiť dočasnú sieť Wi‑Fi na pripojenie k vášmu zariadeniu"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenašli sa žiadne zariadenia. Skontrolujte, či sú zariadenia zapnuté a dostupné na pripojenie."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 595bf8d..7b29526 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaklepanje zaslona, odklepanje z obrazom"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaklepanje zaslona, prstni odtis"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaklepanje zaslona"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Varno odklepanje telefona z obrazom in prstnim odtisom"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Lahko se tudi prijavite v aplikacije in potrjujete plačila"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastavitev odklepanja na ta način:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odklepanje z obrazom"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Omogočite hitrejše odklepanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Prstni odtis"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Prihranite čas z odklepanjem telefona v žepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Naprej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Obraz je dodan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastavite odklepanje z obrazom"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odklepanje z obrazom"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: prstnega odtisa ne morete uporabiti za odklepanje te naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: Prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Prekliči"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprej"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Če tablični računalnik zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Če napravo zaščitite z možnostjo zaklepanja zaslona, je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Če telefon zaščitite z zaklepanjem zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Če tablični računalnik zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Če napravo zaščitite z možnostjo zaklepanja zaslona, je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Če telefon zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ne želite nastaviti kode PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ne želite nastaviti gesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ne želite nastaviti vzorca?"</string>
@@ -540,7 +527,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Nastavite nadomestni način zaklepanja zaslona"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Izberite nadomestni način zaklepanja zaslona"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zaklepanja zaslona"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zaklepanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaklepanje zaslona"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odklepanje z obrazom + geslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nadaljevanje brez odklepanja z obrazom"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefon lahko odklenete z obrazom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrika + vzorec"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrika + koda PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrika + geslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nadaljevanje brez biometrike"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon lahko odklenete z biometričnimi podatki. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogočil skrbnik, pravilnik za šifriranje ali shramba poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vlečenje"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Naslov MAC naprave"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Naključno izbran naslov MAC"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Naslov IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"O omrežju"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podomrežja"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Vnesite veljaven naslov prehoda."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Vnesite veljaven naslov DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Vnesite predpono omrežja, dolgo med 0 in 32 znaki."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (razen v primeru preglasitve z zasebnim strežnikom DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (razen v primeru preglasitve z zasebnim strežnikom DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Prehod"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dolžina predpone omrežja"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Za odklepanje z obrazom nastavite geslo"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Za odklepanje z obrazom nastavite vzorec"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Za odklepanje z obrazom nastavite PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Za uporabo biometrike nastavite geslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Za uporabo biometrike nastavite vzorec"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Za uporabo biometrike nastavite kodo PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ste pozabili geslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ste pozabili vzorec?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ste pozabili svoj PIN?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ni nastavljeno – delovni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Skrbnik"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Vzdevek"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Dodate lahko do toliko uporabnikov: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Uporabnike lahko upravlja samo lastnik tabličnega računalnika."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Uporabnike lahko upravlja samo lastnik telefona."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazaj"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Naprej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončaj"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotografiranje"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Izbira slike"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Izberite fotografijo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartici SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartice SIM"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos kode PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos kode PIN ob zagonu naprave?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos vzorca. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos vzorca ob zagonu naprave?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos gesla. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos gesla ob zagonu naprave?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos kode PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos kode PIN ob zagonu naprave?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos vzorca. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos vzorca ob zagonu naprave?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos gesla. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos gesla ob zagonu naprave?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Omejeno"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ni na voljo ob vzpostavljeni povezavi z operaterjem <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pokaži več"</string>
     <string name="see_less" msgid="2642392725363552793">"Pokaži manj"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite izklopiti storitev operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite izklopiti kartico SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Izklapljanje kartice SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operaterja ni mogoče onemogočiti"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Prišlo je do napake, operaterja ni bilo mogoče onemogočiti."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Vzpostavitev povezave z napravo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi uporabiti začasno omrežje Wi-Fi za vzpostavitev povezave z napravo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ni naprav. Preverite, ali so naprave vklopljene in na voljo za vzpostavitev povezave."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 937fd00..db9f1a8 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kyçja e ekranit, shkyçja me fytyrë"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kyçja e ekranit, gjurma e gishtit"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kyçja e ekranit"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Shkyçe telefonin në mënyrë të sigurt me fytyrën tënde dhe gjurmën e gishtit"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Gjithashtu mund të identifikohesh në aplikacione dhe të konfirmosh pagesën"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfiguro shkyçjen me:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Shkyçja me fytyrë"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Bëje shkyçjen e telefonit të lehtë"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Gjurma e gishtit"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Kurse kohë duke shkyçur telefonin në xhep"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Kapërce"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Para"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Fytyra u shtua"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfiguro shkyçjen me fytyrë"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Shkyçja me fytyrë"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Nuk mund ta përdorësh gjurmën tënde të gishtit për ta shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës tënde."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Gjurma e gishtit mund të jetë më pak e sigurt se sa një kod PIN ose motiv i fortë."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulo"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Jo, faleminderit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kapërce"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Përpara"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Duke mbrojtur tabletin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Duke mbrojtur pajisjen tënde me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Duke mbrojtur telefonin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Duke mbrojtur tabletin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Duke mbrojtur pajisjen tënde me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Duke mbrojtur telefonin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Do ta kapërcesh konfigurimin e kodit PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Do ta kapërcesh konfigurimin e fjalëkalimit?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Do ta kapërcesh konfigurimin e motivit?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Konfiguro metodën rezervë të kyçjes së ekranit"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opsionet e kyçjes së ekranit"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opsionet e kyçjes së ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kyçja e ekranit"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Shkyçja me fytyrë + Fjalëkalimi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Vazhdo pa shkyçjen me fytyrë"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Mund ta shkyçësh telefonin duke përdorur fytyrën. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sistemet biometrike + Motivi"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sistemet biometrike + Kodi PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sistemet biometrike + Fjalëkalimi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Vazhdo pa sistemet biometrike"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Mund ta shkyçësh telefonin duke përdorur sistemet biometrike. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Çaktivizuar nga administratori, politika e enkriptimit ose hapësira ruajtëse e kredencialeve"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Asnjë"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Me rrëshqitje"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC e pajisjes"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresa MAC e rastësishme"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresa e IP-së"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detajet e rrjetit"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska e nënrrjetit"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Shkruaj një adresë të vlefshme porte kalimi."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Shkruaj një adresë të vlefshme DNS-je."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Shkruaj një gjatësi prefiksi rrjeti mes 0 dhe 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (përveçse nëse është anuluar nga DNS-ja private)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (përveçse nëse është anuluar nga DNS-ja private)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Porta e kalimit"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Gjatësia e prefiksit të rrjetit"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Për të përdorur shkyçjen me fytyrë, cakto fjalëkalimin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Për të përdorur shkyçjen me fytyrë, cakto motivin"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Për të përdorur kyçjen me fytyrë, cakto kodin PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Vendos fjalëkalimin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Vendos motivin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Vendos kodin PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Harrove fjalëkalimin?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Harrove motivin?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Harrove kodin PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nuk është konfiguruar - profili i punës"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ti (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Mund të shtosh deri në <xliff:g id="USER_COUNT">%1$d</xliff:g> përdorues"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Vetëm zotëruesi i tabletit mund t\'i menaxhojë përdoruesit."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Vetëm zotëruesi i telefonit mund t\'i menaxhojë përdoruesit."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Prapa"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Përpara"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Përfundo"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Bëj një fotografi"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Zgjidh një imazh"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Zgjidh një fotografi"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartat SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartat SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin tënd PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Po"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Jo"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"I kufizuar"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nuk ofrohet kur është e lidhur me <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Shiko më shumë"</string>
     <string name="see_less" msgid="2642392725363552793">"Shiko më pak"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Të çaktivizohet <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Të çaktivizohet karta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Po çaktivizohet karta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatori celular nuk mund të çaktivizohet"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ndodhi një gabim dhe operatori celular nuk mund të çaktivizohet."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Lidhu me pajisjen"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacioni <xliff:g id="APPNAME">%1$s</xliff:g> dëshiron të përdorë një rrjet të përkohshëm Wi-Fi për t\'u lidhur me pajisjen tënde"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nuk u gjet asnjë pajisje. Sigurohu që pajisjet të jenë të ndezura dhe të gatshme për t\'u lidhur."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 434b327..df90e34 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -323,24 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Закључавање екрана, откључавање лицем"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Закључавање екрана, отисак прста"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Закључавање екрана"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Откључајте телефон безбедно помоћу лица и отиска прста"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Могуће је и пријављивање у апликације и потврђивање плаћања"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Подесите откључавање помоћу:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Откључавање лицем"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Поједноставите откључавање телефона"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отисак прста"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Уштедите на времену и откључајте телефон у џепу"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прескочи"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Даље"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Лице је додато"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Подесите откључавање лицем"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Откључавање лицем"</string>
@@ -419,8 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Не можете да откључавате овај уређај помоћу отиска прста. Више информација затражите од администратора организације."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, хвала"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Настави"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескочи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Даље"</string>
@@ -458,12 +448,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Желите ли да прескочите подешавање PIN-а?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Желите ли да прескочите подешавање лозинке?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Желите ли да прескочите подешавање шаблона?"</string>
@@ -536,7 +523,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Спречите друге да користе овај таблет без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Подесите резервни метод за закључавање екрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Одаберите резервни начин за закључавање екрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опције закључавања екрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опције закључавања екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Закључавање екрана"</string>
@@ -568,16 +555,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Откључавање лицем + лозинка"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Наставите без откључавања лицем"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Можете да откључате телефон помоћу лица. Ова опција захтева резервни метод закључавања екрана из безбедносних разлога."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрија + шаблон"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрија + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрија + лозинка"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Наставите без биометрије"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Можете да откључате телефон помоћу биометрије. Ова опција захтева резервни метод закључавања екрана из безбедносних разлога."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Онемогућио администратор, смернице за шифровање или складиште акредитива"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Превуците"</string>
@@ -1051,6 +1033,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC адреса уређаја"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Насумична MAC адреса"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Детаљи о мрежи"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска подмреже"</string>
@@ -1068,8 +1052,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Унесите важећу адресу мрежног пролаза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Унесите важећу DNS адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Унесите префикс мреже дужине између 0 и 32 знака."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (осим ако га не замени приватни DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (осим ако га не замени приватни DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Мрежни пролаз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Дужина префикса мреже"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1835,19 +1819,16 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Откључавање лицем захтева лозинку"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Откључавање лицем захтева шаблон"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Откључавање лицем захтева PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Подесите лозинку за коришћење биометрије"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Подесите шаблон за коришћење биометрије"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Подесите PIN за коришћење биометрије"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Заборавили сте лозинку?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Заборавили сте шаблон?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Заборавили сте PIN?"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Употребите шаблон за уређај да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Користите шаблон за уређај да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Унесите PIN уређаја да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Унесите лозинку уређаја да бисте наставили"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Употребите шаблон за пословни профил да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Користите шаблон за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"Унесите PIN за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Унесите лозинку за пословни профил да бисте наставили"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Ради веће безбедности користите шаблон за уређај"</string>
@@ -3094,7 +3075,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Није подешено – пословни профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Надимак"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можете да додате највише <xliff:g id="USER_COUNT">%1$d</xliff:g> корисника"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само власник телефона може да управља корисницима."</string>
@@ -3214,9 +3194,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Даље"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Заврши"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сликајте"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Одаберите слику"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Изаберите слику"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM картице"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM картице"</string>
@@ -3963,12 +3940,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос PIN-а при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос шаблона при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи лозинке пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос лозинке при покретању уређаја?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос PIN-а при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева шаблон при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос лозинке при покретању уређаја?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4938,6 +4912,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно када је успостављена веза са оператером <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Прикажи још"</string>
     <string name="see_less" msgid="2642392725363552793">"Прикажи мање"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Желите ли да искључите услугу <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Желите ли да искључите SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM се искључује<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Онемогућавање мобилног оператера није успело"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Дошло је до грешке и онемогућавање мобилног оператера није успело."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Повежите се са уређајем"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Апликација <xliff:g id="APPNAME">%1$s</xliff:g> жели да користи привремену Wi‑Fi мрежу да би се повезала са уређајем"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Није пронађен ниједан уређај Проверите да ли је уређај укључен и доступан за повезивање."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9a073b7..e7867c1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhetens MAC-adress"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Slumpgenererad MAC-adress"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adress"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Nätverksinformation"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Nätmask"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ange en giltig gateway-adress."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ange en giltig DNS-adress."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ange en nätverksprefixlängd mellan 0 och 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (om det inte åsidosätts av Privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (om det inte åsidosätts av Privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Nätverksprefixets längd"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Inte konfigurerad – jobbprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratör"</string>
     <string name="user_you" msgid="3070562015202859996">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Smeknamn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan lägga till upp till <xliff:g id="USER_COUNT">%1$d</xliff:g> användare"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Det är bara surfplattans ägare som kan hantera användare."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Det är bara mobilens ägare som kan hantera användare."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Föregående"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Nästa"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Slutför"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ta ett foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Välj en bild"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Välj en bild"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Inte tillgänglig vid anslutning till <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Visa mer"</string>
     <string name="see_less" msgid="2642392725363552793">"Visa färre"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vill du inaktivera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vill du inaktivera SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kortet inaktiveras <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Det gick inte att inaktivera operatören"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Något gick fel och operatören gick inte att inaktivera."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Anslut till enhet"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vill ansluta till enheten via ett tillfälligt Wi-Fi-nätverk"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Inga enheter hittades. Kontrollera att enheterna är på och går att ansluta till."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 779811a..41bccec 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kufunga skrini, kufungua kwa uso"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kufunga skrini, alama ya kidole"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kufunga skrini"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Fungua simu kwa usalama ukitumia alama ya kidole na uso wako"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Unaweza pia kuingia katika programu na uthibitishe malipo"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Weka mipangilio ya kufungua ukitumia:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Kufungua kwa uso"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Fanya iwe rahisi kufungua simu yako"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Alama ya kidole"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Okoa muda ukifungua simu ikiwa mfukoni"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ruka"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Endelea"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Utambuzi wa uso umeongezwa"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Weka mipangilio ya kufungua kwa uso"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Kufungua kwa uso"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia alama ya kidole chako kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Usalama wa alama ya kidole chako unaweza kuwa wa chini ukilinganishwa na wa mchoro au PIN thabiti."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ghairi"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hapana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ruka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Endelea"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kwa kulinda kompyuta yako kibao ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kwa kulinda kifaa chako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kukitumia ikiwa kitapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kwa kulinda simu yako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kwa kulinda kompyuta yako kibao ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kwa kulinda kifaa chako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kukitumia ikiwa kitapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kwa kulinda simu yako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ungependa kuruka Kuweka PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ungependa kuruka Kuweka Nenosiri?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ungependa kuruka Kuweka Mchoro?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Sanidi mbinu yako mbadala ya kufunga skrini"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Chagua njia mbadala ya kufunga skrini yako"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Chaguo za kufunga skrini"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Chaguo za kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kufunga skrini"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Kufungua kwa uso + Nenosiri"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Endelea bila kipengele cha kufungua kwa uso"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Unaweza kufungua simu yako kwa kutumia uso wako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Bayometriki + Mchoro"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Bayometriki + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Bayometriki + Nenosiri"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Endelea bila kutumia bayometriki"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Unaweza kufungua simu yako ukitumia bayometriki zako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Imezimwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya hati"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Telezesha kidole"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Anwani ya MAC ya kifaa"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Anwani ya MAC kwa nasibu"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Anwani ya IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Maelezo ya mtandao"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mfano wa kijimtandao"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Tafadhali charaza anwani halali ya lango."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Tafadhali charaza anwani halali ya DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Andika urefu wa kiambishi awali cha mtandao kati ya 0 na 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS ya kwanza (isipokuwa ikibatilishwa na DNS ya Faragha)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS ya pili (isipokuwa ikibatilishwa na DNS ya Faragha)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Lango"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Urefu wa kiambishi awali cha mtandao"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Moja kwa moja"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Weka nenosiri ili utumie kufungua kwa uso"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ili utumie kufungua kwa uso, weka mchoro"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Weka PIN ili utumie kufungua kwa uso"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Weka nenosiri ili utumie bayometriki"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Weka mchoro ili utumie bayometriki"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Weka PIN ili utumie bayometriki"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Je, umesahau nenosiri lako?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Je, umesahau mchoro wako?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Je, umesahau PIN yako?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Haujasanidiwa - Wasifu wa kazini"</string>
     <string name="user_admin" msgid="4024553191395768119">"Msimamizi"</string>
     <string name="user_you" msgid="3070562015202859996">"Wewe (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Jina la utani"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Unaweza kuongeza hadi watumiaji <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nyuma"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Endelea"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Kamilisha"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Piga picha"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Chagua picha"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Chagua picha"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kadi"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kadi"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe PIN kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka mchoro wako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe mchoro kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe PIN kabla ya kuanza kukitumia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka mchoro wako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe mchoro kabla ya kuanza kukitumia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ndiyo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Hapana"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Inazuiwa"</string>
@@ -4858,6 +4832,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Angalia zaidi"</string>
     <string name="see_less" msgid="2642392725363552793">"Angalia chache"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Ungependa kuzima <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Ungependa kuzima SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Inazima SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Imeshindwa kuzima mtandao wa mtoa huduma"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hitilafu imetokea na mtandao wa mtoa huduma wako haukuweza kuzimwa."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Unganisha kwenye kifaa"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> yako inataka kutumia mtandao wa muda wa Wi‑Fi kuunganisha kwenye kifaa chako"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Hakuna vifaa vilivyopatikana. Hakikisha kuwa umewasha vifaa na vinaweza kuunganishwa."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 46385a9..ff0d0cf 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"திரைப் பூட்டு, முகம் காட்டித் திறத்தல்"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ஸ்கிரீன் லாக், கைரேகை"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"திரைப் பூட்டு"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"உங்கள் முகம், கைரேகை மூலம் மொபைலைப் பாதுகாப்பாகத் திறக்கலாம்"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"ஆப்ஸில் உள்நுழைந்தும் பேமெண்ட்டை உறுதிப்படுத்தலாம்"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"அன்லாக் செய்யும் முறையை அமையுங்கள்:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"முகம் காட்டித் திறத்தல்"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"உங்கள் மொபைலை எளிதாக அன்லாக் செய்யும்"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"கைரேகை"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"மொபைல் அன்லாக்கின் நேரத்தைச் சேமிக்கும்"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"தவிர்"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"அடுத்து"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"முகம் சேர்க்கப்பட்டது"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'முகம் காட்டித் திறத்தலை’ அமைக்கவும்"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"முகம் காட்டித் திறத்தல்"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\n\n குறிப்பு: இந்தச் சாதனத்தைத் திறக்க, கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: எளிதில் ஊகிக்க முடியாத பேட்டர்ன் அல்லது பின்னைப் பயன்படுத்தும் போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும் போது குறைவான பாதுகாப்பே கிடைக்கும்.\n"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ரத்துசெய்"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"வேண்டாம்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"தவிர்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"அடுத்து"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"பின் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"கடவுச்சொல் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"பேட்டர்ன் அமைவைத் தவிர்க்கவா?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்த டேப்லெட்டைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"பின்புலத் திரைப் பூட்டு முறையை அமைக்கவும்"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"திரைப் பூட்டு விருப்பங்கள்"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"திரைப் பூட்டு விருப்பங்கள்"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"திரைப் பூட்டு"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"முகம் காட்டித் திறத்தல் + கடவுச்சொல்"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"\'முகம் காட்டித் திறத்தல்’ இல்லாமல் தொடரவும்"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"முகத்தைப் பயன்படுத்தி மொபைலைத் திறக்கலாம். இந்த வசதியை உபயோகிக்கும்போது, பாதுகாப்பிற்காகத் திரைப் பூட்டையும் அமைத்திருப்பது அவசியம்."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"பயோமெட்ரிக்ஸும் பேட்டர்னும்"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"பயோமெட்ரிக்ஸும் பின்னும்"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"பயோமெட்ரிக்ஸும் கடவுச்சொல்லும்"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"பயோமெட்ரிக்ஸ் இல்லாமல் தொடர்க"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"பயோமெட்ரிக்ஸைப் பயன்படுத்தி உங்கள் மொபைலைத் திறக்கலாம். பாதுகாப்பிற்காக மாற்றுத் திரைப் பூட்டையும் அமைப்பது அவசியம்."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/நற்சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ஸ்வைப்"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"சாதனத்தின் MAC முகவரி"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ரேண்டம் ஆக்கப்பட்ட MAC முகவரி"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP முகவரி"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"நெட்வொர்க் விவரங்கள்"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"சப்நெட் மாஸ்க்"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"சரியான கேட்வே முகவரியை உள்ளிடவும்."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"சரியான DNS முகவரியை உள்ளிடவும்."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 மற்றும் 32 க்கு இடையிலான நெட்வொர்க் முன் நீளத்தை உள்ளிடவும்."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (தனிப்பட்ட DNS மீறிச் செயல்படாத வரை)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (தனிப்பட்ட DNS மீறிச் செயல்படாத வரை)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"கேட்வே"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"நெட்வொர்க் முன்னொட்டு நீளம்"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"வைஃபை டைரக்ட்"</string>
@@ -1223,7 +1207,7 @@
     <string name="auto_brightness_description" msgid="6807117118142381193">"நீங்கள் இருக்கும் சூழலுக்கும், செய்யும் வேலைகளுக்கும் ஏற்றவாறு, தானாகவே உங்களின் திரை ஒளிர்வு கூடும், குறையும். நீங்கள் எவ்வளவு வெளிச்சத்தை விரும்புகிறீர்கள் என்பதைச் சூழலுக்கேற்ற ஒளிர்வு தெரிந்துகொள்ள, ஸ்லைடரைக் கைமுறையாக நகர்த்தலாம்."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"வெண் சமநிலையை காட்சிப்படுத்தல்"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
-    <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
+    <string name="peak_refresh_rate_title" msgid="1878771412897140903">"சீரான காட்சி"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"சில உள்ளடக்கத்திற்குப் புதுப்பிக்கும் விகிதத்தை 60லிருந்து 90 Hzக்குத் தானாகவே உயர்த்தும். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
     <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ரெஃப்ரெஷ் விகிதம்: Force 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"மேம்பட்ட தொடு இயக்கத்திறனுக்கும் அனிமேஷன் தரத்திற்குமான அதிவேக ரெஃப்ரெஷ் விகிதம். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"முகம் காட்டித் திறக்க பின்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"முகம் காட்டி திறக்க பேட்டர்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"முகம் காட்டித் திறக்க பின்னை அமைக்கவும்"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"பயோமெட்ரிக்ஸுக்கான கடவுச்சொல்லை அமை"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"பயோமெட்ரிக்ஸுக்கான பேட்டர்னை அமை"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"பயோமெட்ரிக்ஸுக்கான பின் குறியீட்டை அமை"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"கடவுச்சொல்லை மறந்துவிட்டீர்களா?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"பேட்டர்னை மறந்துவிட்டீர்களா?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"பின்னை மறந்துவிட்டீர்களா?"</string>
@@ -1991,7 +1972,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ஆப்ஸை முடக்கு"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"இந்த ஆப்ஸை முடக்கினால் Androidம் பிற ஆப்ஸும் எதிர்பார்த்தவாறு செயல்படாமல் போகக்கூடும். கவனத்திற்கு: சாதனத்தை வாங்கும்போதே ஆப்ஸ் நிறுவப்பட்டுள்ளதால் இதை நீக்க இயலாது. இதை முடக்குவதன் மூலம் ஆஃப் செய்யப்பட்ட நிலையில் ஆப்ஸ் சாதனத்திலேயே இருக்கும்"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"அறிவிப்புகளை முடக்கவா?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ஸ்டோர்"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ஆப்ஸின் விவரங்கள்"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"ஆப்ஸ் <xliff:g id="APP_STORE">%1$s</xliff:g> இலிருந்து நிறுவப்பட்டது"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> பற்றிய கூடுதல் தகவல்"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"பணிக் கணக்கு அமைக்கப்படவில்லை"</string>
     <string name="user_admin" msgid="4024553191395768119">"நிர்வாகி"</string>
     <string name="user_you" msgid="3070562015202859996">"நீங்கள் (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"செல்லப்பெயர்"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> பயனர்கள் வரை சேர்க்கலாம்"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"டேப்லெட்டின் உரிமையாளர் மட்டுமே பயனர்களை நிர்வகிக்க முடியும்."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"தொலைபேசியின் உரிமையாளர் மட்டுமே பயனர்களை நிர்வகிக்க முடியும்."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"பின் செல்"</string>
     <string name="wizard_next" msgid="3884832431439072471">"அடுத்து"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"முடி"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"படமெடு"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"படத்தைத் தேர்வுசெய்க"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"படத்தைத் தேர்வுசெய்க"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"சிம் கார்டுகள்"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"சிம் கார்டுகள்"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, பின்னை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது.\n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, பேட்டர்னை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது. \n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, கடவுச்சொல்லை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது. \n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் பின் குறியீடு (PIN) தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, பின் குறியீடு (PIN) தேவைப்படுமாறு அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் பேட்டர்ன் தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, பேட்டர்ன் தேவைப்படுமாறு அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் கடவுச்சொல் தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, கடவுச்சொல் தேவைப்படுமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ஆம்"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"வேண்டாம்"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"கட்டுப்படுத்தியது"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
     <string name="see_more" msgid="7499355691042812723">"மேலும் காட்டு"</string>
     <string name="see_less" msgid="2642392725363552793">"குறைவாகக் காட்டு"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆஃப் செய்யவா?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"சிம்மை ஆஃப் செய்யவா?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"சிம்மை ஆஃப் செய்கிறது<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"தொலைத்தொடர்பு நிறுவனத்தை முடக்க முடியவில்லை"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ஏதோ தவறாகிவிட்டதால் தொலைத்தொடர்பு நிறுவனத்தை முடக்க முடியவில்லை."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"சாதனத்துடன் இணைத்தல்"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"உங்கள் சாதனத்துடன் இணைக்க <xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸ் தற்காலிகமான வைஃபை நெட்வொர்க்கைப் பயன்படுத்த விரும்புகிறது"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"சாதனங்கள் எதுவும் இல்லை. சாதனங்கள் ஆன் செய்யப்பட்டு இணைப்பதற்குத் தயாராக உள்ளனவா என்பதை உறுதிப்படுத்தவும்."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 0596dc4..4aad039 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"స్క్రీన్ లాక్, ముఖం అన్‌లాక్"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"స్క్రీన్ లాక్, వేలిముద్ర"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"స్క్రీన్ లాక్"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ముఖం అలాగే వేలిముద్రతో ఫోన్‌ను సురక్షితంగా అన్‌లాక్ చేయండి"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"మీరు యాప్‌లలో కూడా సైన్ ఇన్ చేసి, పేమెంట్‌ను నిర్ధారించవచ్చు"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"దీనితో అన్‌లాక్ సెటప్ చేయండి:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ఫేస్ అన్‌లాక్"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"మీ ఫోన్‌ను అన్‌లాక్ చేయడం సులభతరం చేయండి"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"వేలిముద్ర"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"మీ జేబులో ఫోన్‌ను అన్‌లాక్ చేసి సమయం ఆదా చేయండి"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"స్కిప్ చేయి"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"తర్వాత"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ముఖం జోడించబడింది"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'ఫేస్ అన్‌లాక్\'ను సెటప్ చేయండి"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ఫేస్ అన్‌లాక్"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ డివైజ్‌ను అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"మీ ఫోన్‌ను అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనిక: నమూనా లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"రద్దు చేయి"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"వద్దు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"కొనసాగించు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"దాటవేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"తర్వాత"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"మీ టాబ్లెట్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖంతో అన్‌లాక్‌ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"మీ పరికరానికి స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు \"ముఖంతో అన్‌లాక్\"ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"మీ ఫోన్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖంతో అన్‌లాక్‌ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"మీ టాబ్లెట్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"మీ పరికరానికి స్క్రీన్ లాక్ రక్షణను జోడించారంటే, ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"మీ ఫోన్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"పిన్ సెటప్‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"పాస్‌వర్డ్‌ సెటప్‌‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ఆకృతి సెటప్‌ను దాటవేయాలా?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని సెటప్ చేయండి"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"స్క్రీన్ లాక్ ఎంపికలు"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"స్క్రీన్ లాక్ ఎంపికలు"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"స్క్రీన్ లాక్"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ముఖంతో అన్‌లాక్ + పాస్‌వర్డ్"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ముఖంతో అన్‌లాక్ లేకుండానే కొనసాగించండి"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఎంపికకు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"బయోమెట్రిక్స్ + ఆకృతి"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"బయోమెట్రిక్స్ + పిన్"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"బయోమెట్రిక్స్ + పాస్‌వర్డ్"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"బయోమెట్రిక్స్ లేకుండా కొనసాగించండి"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"మీరు బయోమెట్రిక్స్‌ను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"స్వైప్"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"డివైజ్ యొక్క MAC చిరునామా"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ర్యాండ‌మ్‌గా రూపొందించిన MAC అడ్రస్‌"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP చిరునామా"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"సబ్‌నెట్ మాస్క్"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"చెల్లుబాటు అయ్యే గేట్‌వే చిరునామాను టైప్ చేయండి."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"చెల్లుబాటు అయ్యే DNS చిరునామాను టైప్ చేయండి."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"నెట్‌వర్క్ ఆదిప్రత్యయ పొడవు 0 మరియు 32 మధ్య ఉండేలా టైప్ చేయండి."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ప్రైవేట్ DNS ద్వారా ఓవర్‌రైడ్ చేయబడనంతవరకు)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ప్రైవేట్ DNS ద్వారా ఓవర్‌రైడ్ చేయబడనంతవరకు)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"గేట్‌వే"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"నెట్‌వర్క్ ప్రిఫిక్స్ పొడవు"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ముఖంతో అన్‌లాక్ కోసం పాస్‌వర్డ్ పెట్టండి"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ముఖంతో అన్‌లాక్ కోసం, ఆకృతి సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ముఖంతో అన్‌లాక్ కోసం, పిన్ సెట్ చేయండి"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"మీ పాస్‌వర్డ్‌ను మరచిపోయారా?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"మీ ఆకృతిని మర్చిపోయారా?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"మీ పిన్‌ను మర్చిపోయారా?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"సెటప్ చేయలేదు - కార్యాలయ ప్రొఫైల్"</string>
     <string name="user_admin" msgid="4024553191395768119">"నిర్వాహకుడు"</string>
     <string name="user_you" msgid="3070562015202859996">"మీరు (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"మారుపేరు"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"మీరు గరిష్టంగా <xliff:g id="USER_COUNT">%1$d</xliff:g> మంది వినియోగదారులను జోడించవచ్చు"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"టాబ్లెట్ యజమాని మాత్రమే వినియోగదారులను నిర్వహించగలరు."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ఫోన్ యజమాని మాత్రమే వినియోగదారులను నిర్వహించగలరు."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"వెనుకకు"</string>
     <string name="wizard_next" msgid="3884832431439072471">"తర్వాత"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ముగించు"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ఫోటోను తీయి"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"చిత్రాన్ని ఎంచుకోండి"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ఫోటోను ఎంచుకోండి"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"సిమ్ కార్డులు"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"సిమ్ కార్డులు"</string>
@@ -3911,12 +3888,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ పిన్‌ను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి పిన్ అవసరమా?&amp;gt;"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ నమూనాను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి నమూనా అవసరమా?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ పాస్‌వర్డ్‌ను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి పాస్‌వర్డ్‌ అవసరమా?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ పిన్‌ను అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి పిన్‌ను అడగాలా?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ ఆకృతిని అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి ఆకృతిని అడగాలా?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ పాస్‌వర్డ్‌ను అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి పాస్‌వర్డ్‌ను అడగాలా?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"అవును"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"వద్దు"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"నియంత్రించబడింది"</string>
@@ -4859,6 +4833,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
     <string name="see_more" msgid="7499355691042812723">"మరిన్నింటిని చూడండి"</string>
     <string name="see_less" msgid="2642392725363552793">"తక్కువ చూడండి"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆఫ్ చేయాలా?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"సిమ్‌ను ఆఫ్ చేయాలా?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"సిమ్‌ను ఆఫ్ చేస్తోంది<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాదు"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ఏదో తప్పు జరిగింది, మీ క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాలేదు."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"పరికరానికి కనెక్ట్ చేయండి"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"మీ పరికరానికి కనెక్ట్ కావడానికి <xliff:g id="APPNAME">%1$s</xliff:g> యాప్ తాత్కాలిక Wi‑Fi నెట్‌వర్క్‌ను ఉపయోగించాలనుకుంటుంది"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"పరికరాలు ఏవీ కనుగొనబడలేదు. పరికరాలు ఆన్‌లో ఉన్నాయని మరియు కనెక్ట్ చేయడానికి అందుబాటులో ఉన్నాయని నిర్ధారించుకోండి."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index af689c6..e126d54 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ล็อกหน้าจอ, การปลดล็อกด้วยใบหน้า"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ล็อกหน้าจอ ลายนิ้วมือ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ล็อกหน้าจอ"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ปลดล็อกโทรศัพท์ได้อย่างปลอดภัยด้วยใบหน้าและลายนิ้วมือของคุณ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"คุณยังลงชื่อเข้าใช้แอปและยืนยันการชำระเงินได้อีกด้วย"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ตั้งค่าการปลดล็อกด้วยสิ่งต่อไปนี้"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ปลดล็อกด้วยใบหน้า"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ปลดล็อกโทรศัพท์ได้ง่ายๆ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ลายนิ้วมือ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ปลดล็อกโทรศัพท์ฉับไว พร้อมใช้เมื่อหยิบ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ข้าม"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ถัดไป"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"เพิ่มใบหน้าแล้ว"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ตั้งค่าปลดล็อกด้วยใบหน้า"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ปลดล็อกด้วยใบหน้า"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์นี้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: ลายนิ้วมืออาจปลอดภัยน้อยกว่า PIN หรือรูปแบบที่เดายาก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ยกเลิก"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ไม่เป็นไร"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ต่อไป"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ข้าม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ถัดไป"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์ได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์ได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์ได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์ได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ข้ามการตั้ง PIN ไหม"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ข้ามการตั้งรหัสผ่านไหม"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ข้ามการตั้งค่ารูปแบบไหม"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ตั้งค่าวิธีการล็อกหน้าจอสำรอง"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ล็อกหน้าจอ"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ปลดล็อกด้วยใบหน้าและรหัสผ่าน"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ดำเนินการต่อโดยไม่ใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ข้อมูลไบโอเมตริก + รูปแบบ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ข้อมูลไบโอเมตริก + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ข้อมูลไบโอเมตริก + รหัสผ่าน"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ดำเนินการต่อโดยไม่ใช้ข้อมูลไบโอเมตริก"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"คุณปลดล็อกโทรศัพท์ได้โดยใช้ข้อมูลไบโอเมตริก ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ปิดใช้โดยผู้ดูแลระบบ นโยบายการเข้ารหัสลับ หรือที่เก็บข้อมูลที่เชื่อถือได้"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"เลื่อน"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ที่อยู่ MAC ของอุปกรณ์"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ที่อยู่ MAC แบบสุ่ม"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ที่อยู่ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"รายละเอียดเครือข่าย"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ซับเน็ตมาสก์"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"พิมพ์ที่อยู่เกตเวย์ที่ถูกต้อง"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"พิมพ์ที่อยู่ DNS ที่ถูกต้อง"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"พิมพ์รหัสนำหน้าเครือข่ายซึ่งยาว 0 ถึง 32 อักขระ"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (หาก DNS ส่วนตัวไม่ลบล้าง)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (หาก DNS ส่วนตัวไม่ลบล้าง)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"เกตเวย์"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ความยาวรหัสนำเครือข่าย"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ตั้งรหัสผ่านเพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ตั้งรูปแบบเพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ตั้ง PIN เพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้งรหัสผ่าน"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้งรูปแบบ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้ง PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"หากลืมรหัสผ่าน"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"หากลืมรูปแบบ"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"หากลืม PIN"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ไม่ได้ตั้งค่า - โปรไฟล์งาน"</string>
     <string name="user_admin" msgid="4024553191395768119">"ผู้ดูแลระบบ"</string>
     <string name="user_you" msgid="3070562015202859996">"คุณ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ชื่อเล่น"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"คุณสามารถเพิ่มผู้ใช้ได้สูงสุดถึง <xliff:g id="USER_COUNT">%1$d</xliff:g> คน"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"เฉพาะเจ้าของแท็บเล็ตเท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"เฉพาะเจ้าของโทรศัพท์เท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ย้อนกลับ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ถัดไป"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"เสร็จสิ้น"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ถ่ายรูป"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"เลือกรูปภาพ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"เลือกรูปภาพ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ซิมการ์ด"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ซิมการ์ด"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ป้อน PIN ก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ใช้รูปแบบก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ใช้รูปแบบเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ขอรหัสผ่านก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ขอรหัสผ่านเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์ คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อน PIN ก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้ช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อน PIN เพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์ คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อนรูปแบบก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อนรูปแบบเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อนรหัสผ่านก่อนเริ่มต้นระบบ อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ใช่"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ไม่"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ถูกจำกัด"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ใช้ไม่ได้เมื่อเชื่อมต่อกับ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"ดูเพิ่ม"</string>
     <string name="see_less" msgid="2642392725363552793">"ดูน้อยลง"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ต้องการปิด <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ปิดซิมใช่ไหม"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"กำลังปิดซิม<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"ปิดใช้ผู้ให้บริการไม่ได้"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"เกิดข้อผิดพลาดที่ทำให้ปิดใช้ผู้ให้บริการไม่ได้"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"เชื่อมต่อกับอุปกรณ์"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"แอป <xliff:g id="APPNAME">%1$s</xliff:g> ต้องการใช้เครือข่าย Wi‑Fi ชั่วคราวเพื่อเชื่อมต่อไปยังอุปกรณ์"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ไม่พบอุปกรณ์ ตรวจสอบว่าอุปกรณ์เปิดอยู่และพร้อมเชื่อมต่อ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5593d41..e27070d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Lock ng screen, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Lock ng screen, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Lock ng screen"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Secure na i-unlock ang phone mo gamit ang mukha at fingerprint mo"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Puwede kang mag-sign in sa mga app at magkumpirma ng bayad"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"I-set up ang pag-unlock sa:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Padaliin ang pag-unlock sa telepono mo"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Padaliing mag-unlock ng phone sa bulsa"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Laktawan"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Susunod"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Naidagdag ang mukha"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"I-set up ang face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gamitin ang iyong fingerprint upang i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Hindi mo maaaring gamitin ang iyong fingerprint upang i-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gamitin ang iyong fingerprint para i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Posibleng hindi gaanong secure ang iyong fingerprint kaysa sa mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselahin"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Huwag na lang"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Laktawan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Susunod"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Sa pamamagitan ng pagprotekta sa iyong tablet gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Sa pamamagitan ng pagprotekta sa iyong device gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Sa pamamagitan ng pagprotekta sa iyong telepono gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Sa pamamagitan ng pagprotekta sa iyong tablet gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Sa pamamagitan ng pagprotekta sa iyong device gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Sa pamamagitan ng pagprotekta sa iyong telepono gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Laktawan ang pag-set up ng PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Laktawan ang pag-set up ng password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Laktawan ang pag-set up ng pattern?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"I-set up ang iyong backup na paraan ng pag-screen lock"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Piliin ang iyong backup na paraan ng pag-lock ng screen"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Mga opsyon sa lock ng screen"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Mga opsyon sa lock ng screen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + Password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Magpatuloy nang walang face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Maa-unlock mo ang iyong telepono gamit ang mukha mo. Para sa seguridad, nangangailangan ang opsyong ito ng backup na lock ng screen."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Magpatuloy nang walang biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puwede mong i-unlock ang iyong phone gamit ang biometrics mo. Para sa seguridad, kinakailangan ng opsyong ito ng backup na lock ng screen."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Na-disable ng admin, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Mag-swipe"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Naka-randomize na MAC address"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Mga detalye ng network"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Mag-type ng isang wastong gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Mag-type ng wastong DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Mag-type haba ng network prefix pagitan 0 at 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (maliban na lang kung mao-override ng Pribadong DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (maliban na lang kung mao-override ng Pribadong DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Haba ng prefix ng network"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Para sa face unlock, mag-set ng password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Para sa face unlock, mag-set ng pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Para sa face unlock, mag-set ng PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para sa biometrics, magtakda ng password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para sa biometrics, magtakda ng pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para sa biometrics, magtakda ng PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Nakalimutan ang iyong password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Nakalimutan ang iyong pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Nakalimutan ang iyong PIN?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Hindi naka-set up - Profile sa trabaho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Ikaw (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Palayaw"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Maaari kang magdagdag ng hanggang <xliff:g id="USER_COUNT">%1$d</xliff:g> (na) user"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Ang may-ari lang ng tablet ang maaaring mamahala ng mga user."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Ang may-ari lang ng telepono ang maaaring mamahala ng mga user."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Bumalik"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Susunod"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Tapusin"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Kumuha ng larawan"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pumili ng larawan"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pumili ng larawan"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Mga SIM card"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Mga SIM card"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng PIN para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong pattern bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng pattern para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong password bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng password para buksan ang iyong device?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng PIN bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang pattern para buksan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng pattern bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang pattern para buksan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng password bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang password para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Huwag"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Pinaghihigpitan"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Hindi available kapag nakakonekta sa <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Tumingin pa"</string>
     <string name="see_less" msgid="2642392725363552793">"Tumingin nang kaunti"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"I-off ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"I-off ang SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ino-off ang SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Hindi ma-disable ang carrier"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nagkaproblema at hindi ma-disable ang iyong carrier."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Kumonekta sa device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Gustong gumamit ng <xliff:g id="APPNAME">%1$s</xliff:g> app ng pansamantalang Wi‑Fi network para kumonekta sa iyong device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Walang nahanap na device. Tiyaking naka-on ang mga device at available para kumonekta."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cd64f06..1068b79 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, yüz tanıma kilidi"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, parmak izi"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran kilidi"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Yüzünüz ve parmak izinizle telefonun kilidini güvenle açın"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Ayrıca uygulamalarda oturum açıp ödemeyi onaylayabilirsiniz"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Kilit açmayı şununla kur:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Yüz tanıma kilidi"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonunuzun kilidini kolayca açın"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Parmak izi"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefonunuzun kilidini cebinizde açıp zaman kazanın"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Atla"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"İleri"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Yüz eklendi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Yüz tanıma kilidini kurun"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Yüz tanıma kilidi"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Bu cihazın kilidini açmak için parmak izinizi kullanamazsınız. Daha fazla bilgi için kuruluşunuzun yöneticisine başvurun."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Parmak iziniz, güçlü bir desen veya PIN\'e oranla daha az güvenli olabilir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"İptal"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hayır, teşekkürler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Devam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Atla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"İleri"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Tabletinizi ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Yüz tanıma kilidini ayarlamak için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Cihazınızı ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Yüz tanıma kilidini ayarlamak için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonunuzu ekran kilidi seçeneğiyle koruyarak, kaybolması veya çalınması durumunda başkaları tarafından kullanılmasını engelleyebilirsiniz. Yüz tanıma kilidini ayarlamak için de bir ekran kilidi seçeneğine ihtiyacınız vardır. Geri gitmek için İptal\'e dokunun."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Tabletinizi ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Cihazınızı ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonunuzu ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN kurulumu atlansın mı?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Şifre kurulumu atlansın mı?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Desen kurulumu atlansın mı?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Yedek ekran kilitleme yönteminizi ayarlayın"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Yedek ekran kilitleme yönteminizi seçin"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekran kilidi seçenekleri"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekran kilidi seçenekleri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekran kilidi"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Yüz tanıma kilidi + Şifre"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Yüz tanıma kilidi olmadan devam et"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefonunuzun kilidini yüzünüzü kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biyometri + Desen"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biyometri + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biyometri + Şifre"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biyometrik kilit açma sistemi kurmadan devam edin"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefonunuzun kilidini biyometri kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Yönetici, şifreleme politikası veya kimlik bilgileri deposu tarafından devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Yok"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hızlıca kaydırma"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Cihaz MAC adresi"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Rastgele MAC adresi"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresi"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Ağ ayrıntıları"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alt ağ maskesi"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Geçerli bir ağ geçidi adresi yazın."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Geçerli bir DNS adresi yazın."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ile 32 arasında bir ağ önek uzunluğu yazın."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Gizli DNS tarafından geçersiz kılınmadığı sürece)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Gizli DNS tarafından geçersiz kılınmadığı sürece)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Ağ geçidi"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ağ önek uzunluğu"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Kablosuz Doğrudan Bağlantı"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Yüz tanıma kilidini kullanmak için şifre belirleyin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Yüz tanıma kilidini kullanmak için desen ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Yüz tanıma kilidini kullanmak için PIN belirleyin"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biyometri kullanmak için şifre ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biyometri kullanmak için desen ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biyometri kullanmak için PIN ayarlayın"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Şifrenizi mi unuttunuz?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Deseninizi mi unuttunuz?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN\'inizi mi unuttunuz?"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Yapılandrılmadı - İş profili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Yönetici"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Takma Ad"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> kişiye kadar kullanıcı ekleyebilirsiniz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Yalnızca tabletin sahibi kullanıcıları yönetebilir."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Yalnızca telefonun sahibi kullanıcıları yönetebilir."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Geri"</string>
     <string name="wizard_next" msgid="3884832431439072471">"İleri"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Son"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotoğraf çek"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Resim seç"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Fotoğraf seçin"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartlar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartlar"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için deseninizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Cihazınızın kilidini açmak için biyometri kullanmaya ek olarak, başlatılmadan önce PIN\'inizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için PIN\'in girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Cihazınızın kilidini açmak için biyometri kullanmaya ek olarak, başlatılmadan önce deseninizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Cihazınızın kilidini açmak için biyometri kullanmanın yanı sıra, başlatılmadan önce şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Evet"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Hayır"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Kısıtlı"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> operatörüne bağlıyken kullanılamaz"</string>
     <string name="see_more" msgid="7499355691042812723">"Daha fazla"</string>
     <string name="see_less" msgid="2642392725363552793">"Daha az göster"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> kapatılsın mı?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM kapatılsın mı?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kapatılıyor<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Operatör devre dışı bırakılamıyor"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Bir hata oluştu ve operatörünüz devre dışı bırakılamadı."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Cihaza bağlanın"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> uygulaması cihazınıza bağlanmak için geçici bir kablosuz ağ kullanmak istiyor"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Hiçbir cihaz bulunamadı. Cihazların açık ve bağlanmaya hazır olduğundan emin olun."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fbd5e91..66aea51 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -326,24 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокування екрана, фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокування екрана, відбиток пальця"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блокування екрана"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Розблоковуйте телефон за рисами обличчя чи відбитком пальця"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Ви також можете входити в додатки й підтверджувати платежі"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Виберіть спосіб розблокування"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Фейсконтроль"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Розблоковуйте телефон без зайвих рухів"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Відбиток пальця"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Розблоковуйте телефон ще в кишені"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропустити"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далі"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Обличчя додано"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Налаштуйте Фейсконтроль"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Фейсконтроль"</string>
@@ -423,8 +414,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Цей пристрій не можна розблоковувати відбитком пальця. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасувати"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ні, дякую"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустити"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далі"</string>
@@ -462,12 +452,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Блокування екрана захистить ваш планшет, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Блокування екрана захистить ваш пристрій, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Блокування екрана захистить ваш телефон, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Блокування екрана захистить ваш планшет, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Блокування екрана захистить ваш пристрій, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Блокування екрана захистить ваш телефон, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Не налаштовувати PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Не налаштовувати пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Не налаштовувати ключ?"</string>
@@ -572,16 +559,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продовжити без Фейсконтролю"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Ви можете розблоковувати свій телефон за допомогою розпізнавання облич. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Біометричні дані та ключ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Біометричні дані й PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Біометричні дані й пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Не використовувати біометрію"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Ви можете розблоковувати свій телефон за допомогою біометричних даних. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Проведіть по екрану"</string>
@@ -1071,6 +1053,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адреса пристрою"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Довільна MAC-адреса"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ІР-адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Деталі мережі"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска підмережі"</string>
@@ -1088,8 +1072,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Введіть дійсну адресу шлюзу."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Введіть дійсну DNS-адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Введіть довжину префікса мережі від 0 до 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (якщо не замінено приватним DNS-сервером)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (якщо не замінено приватним DNS-сервером)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Довжина префіксу мережі"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1857,12 +1841,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Налаштуйте пароль для Фейсконтроля"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Налаштуйте ключ для Фейсконтролю"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Налаштуйте PIN-код для Фейсконтролю"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Щоб увімкнути біометрію, задайте пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Щоб увімкнути біометрію, задайте ключ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Щоб увімкнути біометрію, задайте PIN-код"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забули пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забули ключ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забули PIN-код?"</string>
@@ -3137,7 +3118,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Робочий профіль не налаштовано"</string>
     <string name="user_admin" msgid="4024553191395768119">"Адміністратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдонім"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можна додати максимум стільки користувачів: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Лише власник планшетного ПК може керувати користувачами."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Лише власник телефону може керувати користувачами."</string>
@@ -3257,9 +3237,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далі"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Завершити"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зробити фото"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Вибрати зображення"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Вибрати фото"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карти"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карти"</string>
@@ -4017,12 +3994,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його паролем перед запуском. Доки пристрій не запуститься, він не прийматиме виклики, повідомлення чи сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати пароль перед запуском пристрою?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати PIN-код перед запуском пристрою?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати пароль перед запуском пристрою?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Так"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ні"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Обмежено"</string>
@@ -4047,7 +4021,7 @@
     <string name="storage_type_internal" msgid="979243131665635278">"внутрішня пам\'ять"</string>
     <string name="storage_type_external" msgid="125078274000280821">"зовнішня пам\'ять"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"З <xliff:g id="DATE">%2$s</xliff:g> використано <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="storage_used" msgid="2591194906751432725">"Використано пам’яті"</string>
+    <string name="storage_used" msgid="2591194906751432725">"Використане сховище"</string>
     <string name="change" msgid="273206077375322595">"Змінити"</string>
     <string name="change_storage" msgid="8773820275624113401">"Змінити пам’ять"</string>
     <string name="notifications_label" msgid="8471624476040164538">"Сповіщення"</string>
@@ -5019,6 +4993,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно, коли підключено до оператора <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Докладніше"</string>
     <string name="see_less" msgid="2642392725363552793">"Показати менше"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Вимкнути оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Вимкнути SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Вимкнення SIM-карти<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Не вдається вимкнути оператора"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Сталася помилка. Не вдалося вимкнути оператора."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Підключитися до пристрою"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Додаток <xliff:g id="APPNAME">%1$s</xliff:g> запитує дозвіл підключитися до пристрою через тимчасову мережу Wi‑Fi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Немає пристроїв. Переконайтеся, що пристрої ввімкнені й готові до з’єднання."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f970db3..e2f6070 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"اسکرین لاک، چہرے کے ذریعے غیر مقفل کرنا"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"اسکرین لاک، فنگر پرنٹ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"اسکرین لاک"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"اپنے فون کو اپنے چہرے اور فنگر پرنٹ کے ساتھ محفوظ طریقے سے غیر مقفل کریں"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"آپ ایپس میں بھی سائن ان اور ادائیگی کی تصدیق کرسکتے ہیں"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"اس کے ذریعے غیر مقفل کو سیٹ کریں:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"چہرے کے ذریعے غیر مقفل کریں"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"اپنا فون غیر مقفل کرنا آسان بنائیں"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"فنگر پرنٹ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"اپنی جیب میں فون کو غیر مقفل کر کے وقت کی بچت کریں"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"نظر انداز کریں"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"آگے"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"چہرہ شامل کر دیا گیا"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"چہرے کے ذریعے غیر مقفل کرنا سیٹ اپ کریں"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"چہرے کے ذریعے غیر مقفل کریں"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا فنگر پرنٹ استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"‏اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"منسوخ کریں"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نہیں شکریہ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"نظر انداز کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"آگے جائیں"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"اگر آپ اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"اگر آپ اپنے آلہ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"اگر آپ اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"اگر آپ اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"اگر آپ اپنے آلے کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"اگر آپ اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"‏PIN سیٹ اپ کو نظر انداز کریں؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"پاس ورڈ کے سیٹ اپ نظر انداز کریں؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"پیٹرن کے سیٹ اپ نظر انداز کریں؟"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"بیک اپ اسکرین لاک کے اپنے طریقے کو ترتیب دیں"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ منتخب کریں"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"اسکرین لاک کے اختیارات"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"اسکرین لاک کے اختیارات"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"اسکرین لاک"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"چہرے کے ذریعے غیر مقفل کرنا + پاس ورڈ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"چہرے کے ذریعے غیر مقفل کیے بغیر جاری رکھیں"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"آپ اپنے فون کو اپنا چہرہ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"بایو میٹرکس + پیٹرن"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"‏بایو میٹرکس + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"بایو میٹرکس + پاس ورڈ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"بایو میٹرکس کے بغیر جاری رکھیں"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"آپ اپنے بایو میٹرکس کا استعمال کر کے اپنے فون کو غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"منتظم، مرموز کاری کی پالیسی یا اسناد اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"سوائپ"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏آلہ کا MAC پتہ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏بے ترتیب MAC پتہ"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏IP پتہ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"نیٹ ورک کی تفصیلات"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"سب نیٹ ماسک"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ایک درست گیٹ وے پتہ ٹائپ کریں۔"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏ایک درست DNS پتہ ٹائپ کریں۔"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 اور 32 کے طوالت کے درمیان ایک نیٹ ورک سابقہ ٹائپ کریں۔"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‏DNS ‫1 (جب تک نجی DNS نے اوور رائیڈ نہ کیا ہو)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‏DNS ‫2 (جب تک نجی DNS نے اوور رائیڈ نہ کیا ہو)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"گیٹ وے"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"نیٹ ورک کے سابقہ کی لمبائی"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏Wi-Fi ڈائریکٹ"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"فیس انلاک کے لیے، پاس ورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"فیس انلاک استعمال کیلئے، پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"‏فیس انلاک کے استعمال کے لیے PIN سیٹ کریں"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"پاس ورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"پیٹرن سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"‏PIN سیٹ کریں"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"اپنا پاس ورڈ بھول گئے؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"اپنا پیٹرن بھول گئے؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"‏اپنا PIN بھول گئے؟"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ترتیب نہیں دیا گیا - دفتری پروفائل"</string>
     <string name="user_admin" msgid="4024553191395768119">"منتظم"</string>
     <string name="user_you" msgid="3070562015202859996">"آپ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"عرفی نام"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"آپ <xliff:g id="USER_COUNT">%1$d</xliff:g> تک صارفین شامل کر سکتے ہیں"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"صرف ٹیبلٹ کا مالک صارفین کا نظم کر سکتا ہے۔"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"صرف فون کا مالک صارفین کا نظم کر سکتا ہے۔"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"واپس جائیں"</string>
     <string name="wizard_next" msgid="3884832431439072471">"اگلا"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"مکمل کریں"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ایک تصویر لیں"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ایک تصویر منتخب کریں"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"تصویر منتخب کریں"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏SIM کارڈز"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏SIM کارڈز"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنا چہرہ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کو طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے PIN طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنے چہرے کا استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنا پیٹرن طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنے چہرے کو استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاس ورڈ طلب کریں؟"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"‏اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنے PIN کو طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ ہونے سے پہلے PIN طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنا پیٹرن طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالز، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ کرنے سے پہلے پیٹرن طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالز، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ کرنے سے پہلے پاس ورڈ طلب کریں؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ہاں"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"نہیں"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محدود کردہ ہے"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
     <string name="see_more" msgid="7499355691042812723">"مزید دیکھیں"</string>
     <string name="see_less" msgid="2642392725363552793">"کم دیکھیں"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آف کریں؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏SIM آف کریں؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏<xliff:g id="ELLIPSIS">…</xliff:g>SIM کو آف کیا جا رہا ہے"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"کیریئر کو غیر فعال نہیں کیا جا سکتا"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"کچھ غلط ہوگیا اور آپ کے کیریئر کو غیر فعال نہیں کیا سکا۔"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"آلے سے منسلک کریں"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏<xliff:g id="APPNAME">%1$s</xliff:g> ایپ آپ کے آلے سے منسلک ہونے کے لیے عارضی Wi-Fi نیٹ ورک استعمال کرنا چاہتی ہے"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"کوئی آلہ نہیں ملا۔ یقینی بنائیں کہ آلات آن ہیں اور منسلک کرنے کے لیے دستیاب ہیں۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 96c9cc3..7c85449 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -322,7 +322,7 @@
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran qulfi"</string>
     <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Telefon qulfini yuz va barmoq bilan ochish ham mumkin"</string>
     <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Ilovalarga kirish va toʻlovni tasdiqlash ham mumkin"</string>
-    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Qulfdan chiqarish usulini sozlang:"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Qulfni ochish usulini sozlang:"</string>
     <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Yuz bilan ochish"</string>
     <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonni qulfdan osongina chiqaring"</string>
     <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Barmoq izi"</string>
@@ -551,9 +551,9 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Yuz bilan ochish + parol"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Yuz bilan ochish funksiyasisiz davom etish"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefonni yuz orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
-    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik tekshiruv + Grafik kalit"</string>
-    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik tekshiruv + PIN kod"</string>
-    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik tekshiruv + Parol"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriya + Grafik kalit"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriya + PIN kod"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriya + Parol"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biometrik tekshiruvsiz davom etish"</string>
     <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefonni biometrik tekshiruv orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administrator, shifrlash siyosati, yoki hisob ma’lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
@@ -1013,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"Tarmoq nomi (SSID)"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Qurilmaning MAC manzili"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tasodifiy MAC manzil"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP manzil"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Tarmoq tafsilotlari"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Quyi tarmoq niqobi"</string>
@@ -1030,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Shlyuz manzilini to‘g‘ri kiriting."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"DNS manzilini to‘g‘ri kiriting."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Tarmoq raqamlari sig‘imini 0 va 32 oralig‘ida tering."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (shaxsiy DNS server bilan almashtirilmasa)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (shaxsiy DNS server bilan almashtirilmasa)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Shlyuz"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tarmoq prefiksi uzunligi"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1795,9 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Yuz bilan ochish uchun parolni sozlang"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Yuz bilan ochish uchun grafik parolni sozlang"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Yuz bilan ochish uchun PIN kodni sozlang"</string>
-    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometrika uchun parol belgilang"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometrika uchun grafik kalit belgilang"</string>
-    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometrika uchun PIN kod belgilang"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometriya uchun avval parol belgilang"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometriya uchun grafik kalit belgilang"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometriya uchun avval PIN kod belgilang"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Parolni unutdingizmi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Chizmali kalitni unutdingizmi?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN kodni unutdingizmi?"</string>
@@ -3030,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ish profili – sozlanmagan"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nik nomi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> tagacha foydalanuvchi qo‘shish mumkin"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Faqat planshetning egasi foydalanuvchilarni boshqara oladi."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Faqat telefonning egasi foydalanuvchilarni boshqara oladi."</string>
@@ -3150,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Orqaga"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Keyingisi"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Yakunlash"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Suratga olish"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Rasm tanlash"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Surat tanlash"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartalar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartalar"</string>
@@ -3268,7 +3266,7 @@
     <string name="keywords_app_pinning" msgid="1564144561464945019">"ekranni mahkamlash"</string>
     <string name="keywords_profile_challenge" msgid="5135555521652143612">"ish vazifasi, ish, profil"</string>
     <string name="keywords_unification" msgid="2677472004971453468">"ish profili, boshqariluvchi profil, birlashtirish, birlashuv, ish, profil"</string>
-    <string name="keywords_gesture" msgid="3456930847450080520">"imo-ishoralar"</string>
+    <string name="keywords_gesture" msgid="3456930847450080520">"ishoralar"</string>
     <string name="keywords_cards_passes" msgid="4798102029412153067">"kartalar, talonlar"</string>
     <string name="keywords_device_controls" msgid="8962494082504033651">"qurilma boshqaruv elementlari, boshqaruv elementlari"</string>
     <string name="keywords_payment_settings" msgid="6268791289277000043">"to‘lash, bosish, to‘lovlar"</string>
@@ -4430,7 +4428,7 @@
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Joy ochish"</string>
-    <string name="gesture_preference_title" msgid="8291899281322647187">"Imo-ishoralar"</string>
+    <string name="gesture_preference_title" msgid="8291899281322647187">"Ishoralar"</string>
     <string name="gesture_preference_summary" product="default" msgid="7941981260703379398">"Telefonni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4031666250963488007">"Planshetni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="device" msgid="3520072325356373349">"Qurilmani boshqarish uchun tezkor imo-ishoralar"</string>
@@ -4833,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> bilan ishlamaydi"</string>
     <string name="see_more" msgid="7499355691042812723">"Yana"</string>
     <string name="see_less" msgid="2642392725363552793">"Kamroq"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faolsizlantirilsinmi?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM karta faolsizlantirilsinmi?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM karta faolsizlantirmoqda<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Aloqa operatori faolsizlantirilmadi"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xatolik yuz berdi va aloqa operatoringiz faolsizlantirilmadi."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Qurilmaga ulanish"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ilovasi qurilmangizga ulanish uchun vaqtinchalik Wi‑Fi tarmoqdan foydalanmoqchi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Qurilmalar topilmadi. Qurilmalar yoniq va tarmoqda ekanligi tekshiring."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c613f4f..947a5be 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Phương thức khóa màn hình, mở khóa bằng khuôn mặt"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Phương thức khóa màn hình, vân tay"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Phương thức khóa màn hình"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Mở khóa điện thoại an toàn bằng khuôn mặt và vân tay"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Bạn cũng có thể đăng nhập vào ứng dụng và xác nhận thanh toán"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Thiết lập phương thức mở khóa bằng:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Mở khóa bằng khuôn mặt"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Giúp bạn mở khóa điện thoại dễ dàng"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vân tay"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Tiết kiệm thời gian khi mở khóa ngay trong túi"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Bỏ qua"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tiếp theo"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Đã thêm khuôn mặt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Thiết lập tính năng mở khóa bằng khuôn mặt"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Mở khóa bằng khuôn mặt"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Dùng vân tay để 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 vân tay để 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_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Dùng vân tay để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Vân tay có thể kém an toàn hơn hình mở khóa hoặc mã PIN mạnh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hủy"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Không, cảm ơn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Bỏ qua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tiếp theo"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Bảo vệ máy tính bảng của bạn bằng tùy chọn khóa màn hình để không ai khác sử dụng được nếu máy tính bảng này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Bảo vệ thiết bị của bạn bằng tùy chọn khóa màn hình để không ai khác sử dụng được nếu thiết bị này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Bằng cách bảo vệ điện thoại của bạn bằng một phương thức khóa màn hình, không ai có thể sử dụng được điện thoại này nếu điện thoại bị mất hoặc bị đánh cắp. Bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Bảo vệ máy tính bảng của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng máy tính bảng này trong trường hợp máy tính bảng bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Bảo vệ thiết bị của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng thiết bị này trong trường hợp thiết bị bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Bảo vệ điện thoại của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng điện thoại này trong trường hợp thiết bị bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Bỏ qua bước thiết lập mã PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Bỏ qua bước thiết lập mật khẩu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Bỏ qua bước thiết lập hình mở khóa?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Thiết lập phương pháp khóa màn hình dự phòng của bạn"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Chọn phương thức khóa màn hình dự phòng"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Tùy chọn phương thức khóa màn hình"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Tùy chọn phương thức khóa màn hình"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Phương thức khóa màn hình"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Mở khóa bằng khuôn mặt + Mật khẩu"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Tiếp tục mà không thiết lập tính năng mở khóa bằng khuôn mặt"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Bạn có thể mở khóa điện thoại bằng khuôn mặt của mình. Để bảo mật, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Nhận dạng sinh trắc học + Hình mở khóa"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Nhận dạng sinh trắc học + Mã PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Nhận dạng sinh trắc học + Mật khẩu"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Tiếp tục mà không thiết lập tính năng nhận dạng sinh trắc học"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Bạn có thể mở khóa điện thoại bằng tính năng nhận dạng sinh trắc học. Để bảo mật, tính năng này yêu cầu bạn phải có một phương thức khóa màn hình dự phòng."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Do quản trị viên tắt, c.sách mã hóa hay vùng l.trữ t.tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vuốt"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Địa chỉ MAC của thiết bị"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Địa chỉ MAC ngẫu nhiên"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Địa chỉ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Chi tiết mạng"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mặt nạ mạng con"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Hãy nhập địa chỉ cổng hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Hãy nhập địa chỉ DNS hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Hãy nhập độ dài tiền tố mạng từ 0 đến 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nếu không bị DNS riêng ghi đè)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nếu không bị DNS riêng ghi đè)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Cổng"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Độ dài tiền tố mạng"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Đặt mật khẩu để dùng tính năng mở khóa bằng khuôn mặt"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Đặt hình mở khóa để dùng tính năng mở khóa bằng khuôn mặt"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Đặt mã PIN để dùng tính năng mở khóa bằng khuôn mặt"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Đặt mật khẩu để dùng tính năng nhận dạng sinh trắc học"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Đặt hình mở khóa để dùng tính năng nhận dạng sinh trắc học"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Đặt mã PIN để dùng tính năng nhận dạng sinh trắc học"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Bạn quên mật khẩu?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Bạn quên hình mở khóa?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Bạn quên mã PIN?"</string>
@@ -2627,7 +2608,7 @@
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Tự động bật"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Chưa có lịch biểu nào"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Dựa trên thói quen của bạn"</string>
-    <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Dựa trên số phần trăm pin"</string>
+    <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Dựa trên mức phần trăm pin"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Nếu pin có khả năng hết trước lần sạc thông thường tiếp theo, hệ thống sẽ bật Trình tiết kiệm pin."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Sẽ bật khi pin ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Đặt lịch biểu"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Chưa thiết lập - Hồ sơ công việc"</string>
     <string name="user_admin" msgid="4024553191395768119">"Quản trị viên"</string>
     <string name="user_you" msgid="3070562015202859996">"Bạn (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Biệt hiệu"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Bạn có thể thêm tối đa <xliff:g id="USER_COUNT">%1$d</xliff:g> người dùng"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Chỉ chủ sở hữu máy tính bảng mới có thể quản lý người dùng."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Chỉ chủ sở hữu điện thoại mới có thể quản lý người dùng."</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Quay lại"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tiếp theo"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Hoàn tất"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Chụp ảnh"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Chọn hình ảnh"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Chọn ảnh"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Thẻ SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Thẻ SIM"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu mã PIN để khởi động thiết bị của mình không?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu hình mở khóa để khởi động thiết bị của mình không?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu mật khẩu để khởi động thiết bị của mình không?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Có"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Không"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Bị hạn chế"</string>
@@ -4798,7 +4772,7 @@
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Điện thoại sẽ tự động chuyển sang nhà mạng này khi nằm trong vùng phủ sóng"</string>
     <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Không có thẻ SIM nào"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Tùy chọn cuộc gọi"</string>
-    <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn SMS"</string>
+    <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn cho SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Luôn hỏi"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Thêm mạng"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Xem thêm"</string>
     <string name="see_less" msgid="2642392725363552793">"Xem bớt"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Tắt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Tắt SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Đang tắt SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Không thể tắt nhà mạng"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Đã xảy ra lỗi nên bạn không thể tắt nhà mạng."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Kết nối với thiết bị"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Ứng dụng <xliff:g id="APPNAME">%1$s</xliff:g> muốn dùng mạng Wi-Fi tạm thời để kết nối với thiết bị của bạn"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Không tìm thấy thiết bị nào. Đảm bảo rằng các thiết bị đang bật và sẵn sàng kết nối."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2fdf9cf..0d04ede 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"屏幕锁定、人脸解锁"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"屏幕锁定、指纹"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"屏幕锁定"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用您的面孔和指纹安全地解锁手机"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"您还可以登录应用和确认付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"设置解锁方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"人脸解锁"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"轻松解锁手机"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指纹"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解锁口袋中的手机"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"跳过"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"下一步"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已添加面孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"设置人脸解锁"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"人脸解锁"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指纹解锁手机或批准购买交易。\n\n请注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指纹解锁手机或批准购买交易。\n\n请注意：指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"继续"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"跳过"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"下一步"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"通过屏幕锁定选项来保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"通过屏幕锁定选项来保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"通过屏幕锁定选项来保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"设置屏幕锁定选项可保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"设置屏幕锁定选项可保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"设置屏幕锁定选项可保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要跳过 PIN 码设置吗？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要跳过密码设置吗？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要跳过图案设置吗？"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"启用设备保护功能可防止他人在未经您允许的情况下使用此平板电脑。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"设置备用屏幕锁定方式"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"选择您的备用屏幕锁定方式"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"屏幕锁定选项"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"屏幕锁定选项"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"屏幕锁定"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"人脸解锁 + 密码"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"不设置人脸解锁并继续"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用自己的面孔将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物识别 + 解锁图案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物识别 + PIN 码"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物识别 + 密码"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不使用生物识别并继续操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"您可以使用生物识别解锁手机。为了安全起见，您必须设置备用屏幕锁定方式才能使用此选项。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑动"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"设备 MAC 地址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"随机生成的 MAC 地址"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 地址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"网络详情"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子网掩码"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"请键入有效的网关地址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"请输入有效的DNS地址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"键入长度在 0 到 32 之间的网络前缀。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1（除非已被专用 DNS 替换）"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2（除非已被专用 DNS 替换）"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"网络前缀长度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WLAN 直连"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"要使用人脸解锁，请设置密码"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"要使用人脸解锁，请设置图案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"要使用人脸解锁，请设置 PIN 码"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如需使用生物识别，请设置密码"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如需使用生物识别，请设置解锁图案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如需使用生物识别，请设置 PIN 码"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘记了密码？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘记了图案？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘记了 PIN 码？"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"未设置 - 工作资料"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理员"</string>
     <string name="user_you" msgid="3070562015202859996">"您（<xliff:g id="NAME">%s</xliff:g>）"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"昵称"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"您最多可添加 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位用户"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板电脑的机主可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手机的机主可以管理用户。"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍照"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"选择图片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"选择照片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要输入密码才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受限"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"连接到<xliff:g id="CARRIER">%1$s</xliff:g>时无法使用"</string>
     <string name="see_more" msgid="7499355691042812723">"查看更多"</string>
     <string name="see_less" msgid="2642392725363552793">"隐藏部分"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡吗？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"无法停用运营商"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"出了点问题，无法停用您的运营商。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"连接到设备"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"“<xliff:g id="APPNAME">%1$s</xliff:g>”应用要使用临时 WLAN 网络连接到您的设备"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到设备。请确保设备已开启并可连接到网络。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 38a1d72..b008879 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 臉孔解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"螢幕鎖定"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用臉孔和指紋安全解鎖手機"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"您亦可登入應用程式並確認付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"設定解鎖方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"面孔解鎖"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"輕鬆解鎖手機"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解鎖口袋中的手機"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"略過"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"繼續"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已加入臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"設定「臉孔解鎖」"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"臉孔解鎖"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指紋解鎖手機或核准購物交易。\n\n請注意：您無法使用指紋解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指紋解鎖手機或核准購物交易。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"使用「螢幕鎖定」選項保護您的平板電腦，這樣即使平板電腦遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"使用「螢幕鎖定」選項保護您的裝置，這樣即使裝置遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"使用「螢幕鎖定」選項保護您的手機，這樣即使手機遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"使用「螢幕鎖定」選項保護您的平板電腦，這樣即使平板電腦遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"使用「螢幕鎖定」選項保護您的裝置，這樣即使裝置遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"使用「螢幕鎖定」選項保護您的手機，這樣即使手機遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要略過 PIN 設定嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要略過密碼設定嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要略過圖案設定嗎？"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此平板電腦。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"設定後備螢幕鎖定的方法"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"選擇您的後備螢幕鎖定方式"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"螢幕鎖定選項"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"螢幕鎖定"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"臉孔解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"不使用「臉孔解鎖」並繼續"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用臉孔解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物識別 + 圖案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物識別 + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物識別 + 密碼"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不設定生物識別功能並繼續操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"您可以使用生物識別功能解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"裝置 MAC 位址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"隨機 MAC 位址"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 位址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"網絡詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子網絡遮罩"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"請輸入有效的閘道位址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"請輸入有效的 DNS 位址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"請輸入介乎 0 至 32 之間的網絡首碼長度。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (除非由私人 DNS 覆寫)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (除非由私人 DNS 覆寫)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"網絡前置字元長度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1814,12 +1798,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"要使用「臉孔解鎖」，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"要使用「臉孔解鎖」，請設定圖案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"要使用「臉孔解鎖」，請設定 PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如要使用生物識別功能，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如要使用生物識別功能，請設定圖案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如要使用生物識別功能，請設定 PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘記密碼嗎？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘記圖案嗎？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘記 PIN 嗎？"</string>
@@ -3052,7 +3033,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"尚未設定 - 公司檔案"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理員"</string>
     <string name="user_you" msgid="3070562015202859996">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"暱稱"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"您可以加入多達 <xliff:g id="USER_COUNT">%1$d</xliff:g> 個用戶"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手機的擁有者可以管理使用者。"</string>
@@ -3172,9 +3152,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍攝相片"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"選擇圖片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"選取相片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3910,12 +3887,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"除了使用臉孔解鎖裝置外，您亦可以設定裝置必需 PIN 才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需 PIN 才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"除了使用臉孔解鎖裝置外，您亦可以設定裝置必需圖案才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需圖案才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"除了使用臉孔解鎖外，您亦可以設定裝置必需密碼才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需密碼才能啟動嗎？"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要輸入 PIN 才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要輸入 PIN 才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要畫出圖案才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要畫出圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要輸入密碼才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受限制"</string>
@@ -4698,7 +4672,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"允許應用程式控制 Wi-Fi"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"允許這個應用程式開啟或關閉 Wi-Fi，掃瞄和連線至 Wi-Fi 網絡、新增或移除網絡，或啟動僅限本機的熱點"</string>
     <string name="media_output_title" msgid="8283629315159510680">"播放媒體的裝置"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"透過以下裝置播放「<xliff:g id="LABEL">%s</xliff:g>」中的媒體"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"使用以下裝置播放「<xliff:g id="LABEL">%s</xliff:g>」的內容"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"此裝置"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"手機"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"平板電腦"</string>
@@ -4858,6 +4832,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連接至<xliff:g id="CARRIER">%1$s</xliff:g>時使用"</string>
     <string name="see_more" msgid="7499355691042812723">"查看更多"</string>
     <string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"無法停用流動網絡供應商"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生問題，無法停用您的流動網絡供應商。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"連接裝置"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"「<xliff:g id="APPNAME">%1$s</xliff:g>」應用程式要求使用臨時 Wi-Fi 網絡連接您的裝置"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到任何裝置。請確保裝置已開啟，並可連接網絡。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a443dde..491eae5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 人臉解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"螢幕鎖定"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用你的臉孔和指紋安全解鎖手機"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"你也可以登入應用程式及確認付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"設定解鎖方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"人臉解鎖"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"輕鬆解鎖手機"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解鎖口袋中的手機"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"略過"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"繼續"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已新增臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"設定人臉解鎖功能"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"人臉解鎖"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：你無法使用指紋將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"建議你設定螢幕鎖定選項保護你的平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"建議你設定螢幕鎖定選項保護你的裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"建議你設定螢幕鎖定選項保護你的手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"建議你設定螢幕鎖定選項來保護平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"建議你設定螢幕鎖定選項來保護裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"建議你設定螢幕鎖定選項來保護手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要略過 PIN 碼設定程序嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要略過密碼設定程序嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要略過解鎖圖案設定程序嗎？"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這台平板電腦。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這個裝置。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這支手機。請選擇你要使用的螢幕鎖定方式。"</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"設定備用螢幕鎖定方法"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"選擇備用的螢幕鎖定方法"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"螢幕鎖定選項"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"螢幕鎖定"</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"人臉解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"繼續但不設定人臉解鎖功能"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"你可以使用自己的臉孔將手機解鎖。為了安全起見，必須先設定備用螢幕鎖定方式，才能使用這個選項。"</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物特徵辨識 + 解鎖圖案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物特徵辨識 + PIN 碼"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物特徵辨識 + 密碼"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不設定生物特徵辨識功能並繼續操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"你可以使用生物特徵辨識功能將手機解鎖。為了安全起見，你必須設定備用的螢幕鎖定方式，才能使用這個選項。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"裝置的 MAC 位址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"隨機化 MAC 位址"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 位址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"網路詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子網路遮罩"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"輸入有效的閘道位址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"請輸入有效的 DNS 位址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"輸入長度介於 0 到 32 之間的網路前置碼。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (除非由私人 DNS 覆寫)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (除非由私人 DNS 覆寫)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"網路前置碼長度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1813,12 +1797,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"如要使用人臉解鎖功能，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"如要使用人臉解鎖功能，請設定解鎖圖案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"如要使用人臉解鎖功能，請設定 PIN 碼"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如要使用生物特徵辨識功能，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如要使用生物特徵辨識功能，請設定解鎖圖案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如要使用生物特徵辨識功能，請設定 PIN 碼"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘記密碼了嗎？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘記解鎖圖案了嗎？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘記 PIN 碼了嗎？"</string>
@@ -3051,7 +3032,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"尚未設定 - 工作設定檔"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理員"</string>
     <string name="user_you" msgid="3070562015202859996">"你 (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"暱稱"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"你最多可新增 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位使用者"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手機的擁有者可以管理使用者。"</string>
@@ -3171,9 +3151,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍照"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"選擇圖片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"選取相片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3909,12 +3886,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要輸入 PIN 碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要畫出解鎖圖案才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要輸入密碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要輸入 PIN 碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要畫出解鎖圖案才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要輸入密碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受到限制"</string>
@@ -4469,7 +4443,7 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"在主螢幕按鈕上向上滑動，即可切換應用程式。再次向上滑動可查看所有應用程式。輕觸返回按鈕可返回上一個畫面。"</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"體驗新版主螢幕按鈕"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"啟用新手勢即可切換應用程式"</string>
-    <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"透過手勢操作系統"</string>
+    <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"手勢操作"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"從螢幕底部向上滑動即可前往主螢幕。從螢幕底部向上滑動並按住，然後再放開可切換應用程式。從左側或右側邊緣向另一側滑動可返回上一個畫面。"</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"透過 3 個按鈕操作系統"</string>
     <string name="legacy_navigation_summary" msgid="5905301067778326433">"使用螢幕底部的按鈕返回上一個畫面、前往主畫面及切換應用程式。"</string>
@@ -4857,6 +4831,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連線到「<xliff:g id="CARRIER">%1$s</xliff:g>」時使用"</string>
     <string name="see_more" msgid="7499355691042812723">"顯示更多"</string>
     <string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"無法停用電信業者"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生錯誤，無法停用你的電信業者。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"連線至裝置"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"「<xliff:g id="APPNAME">%1$s</xliff:g>」應用程式想透過臨時的 Wi-Fi 網路連線至你的裝置"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到裝置。請確認裝置已經開啟並可進行連線。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 51c7f83..427492c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -320,24 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ukukhiya isikrini, i-face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ukukhiywa kwesikrini, izigxivizo zeminwe"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Isikrini sivaliwe"</string>
-    <!-- no translation found for multi_biometric_enroll_title (3007607723604088374) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_subtitle (2900786940599073108) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_setup_with (421375792889910150) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_title (7627564065626355692) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_face_unlock_description (7626442550602926682) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_title (3839935495273854171) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_fingerprint_unlock_description (116938134430420778) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_skip (7301215196571580858) -->
-    <skip />
-    <!-- no translation found for multi_biometric_enroll_next (6220680618102151619) -->
-    <skip />
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Vula ifoni yakho ngokuphepha ngobuso bakho nangezigxivizo zomunwe"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="2900786940599073108">"Ungangena nangemvume kuzinhlelo zokusebenza futhi uqinisekise inkokhelo"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Setha ukuvula nge:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"I-face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Yenza ukuvula iphoni yakho kube lula"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Izigxivizo zeminwe"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Yonga isikhathi ngokuvula ifoni ephaketheni lakho"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Yeqa"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Okulandelayo"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ubuso bungeziwe"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Setha i-face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"I-Face unlock"</string>
@@ -415,8 +406,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Sebenzisa isigxivizo zomunwe zakho ukuze uvule ifoni yakho noma uvume ukuthenga.\n\nInothi: Awukwazi ukusebenzisa isigxivizo somunwe ukuvula le divayisi. Ngolwazi olubanzi, xhumana nomlawuli wenhlangano yakho."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Sebenzisa izigxivizo zeminwe zakho ukuvula ifoni yakho noma uvume ukuthenga.\n\nInothi: Isigxivizo sakho somunwe singaphepha kancane kunephethini eqinile nomai-PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Khansela"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_no_thanks (6104718999323591180) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Cha ngiyabonga"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Yeqa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Okulandelayo"</string>
@@ -454,12 +444,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ngokuvikela ithebulethi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahleka noma intshontshwa. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ngokuvikela idivayisi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ingalahleka noma intshontshwe. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ngokuvikela ifoni yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahlekile noma intshontshiwe. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (3943278149639587227) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5424064454068220988) -->
-    <skip />
-    <!-- no translation found for biometrics_lock_screen_setup_skip_dialog_text (5668256546179188638) -->
-    <skip />
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ngokuvikela ithebulethi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahleka noma intshontshwa. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ngokuvikela idivayisi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ingalahleka noma intshontshwe. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ngokuvikela ifoni yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahlekile noma intshontshiwe. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Yeqa ukusetha i-PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Yeqa ukusetha iphasiwedi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Yeqa ukusetha iphethini?"</string>
@@ -532,7 +519,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
-    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Setha indlela yakho yokwenza isipele ukukhiya isikrini"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Khetha indlela yokukhiya isikrini yakho eyikhophi yasenqolobaneni"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Izinketho zokukhiya isikrini"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Izinketho zokukhiya isikrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Isikrini sivaliwe."</string>
@@ -564,16 +551,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"I-Face unlock + Iphasiwedi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Qhubeka ngaphandle kwe-face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Ungavula ifoni yakho usebenzisa ubuso bakho. Ngokuvikeleka, le nketho idinga isikrini sokukhiya esenziwe isipele."</string>
-    <!-- no translation found for biometrics_unlock_set_unlock_pattern (8871485472202659) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_pin (1729940978662427512) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_set_unlock_password (5368133215008755916) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_skip_biometrics (8260715582785687329) -->
-    <skip />
-    <!-- no translation found for biometrics_unlock_title (7769374223959937435) -->
-    <skip />
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"I-Biometrics + Iphethini"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"I-Biometrics + Iphinikhodi"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"I-Biometrics + Iphasiwedi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Qhubeka ngaphandle kwe-biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Ungavula ifoni yakho usebenzisa i-biometrics yakho. Ngokuphepha, le nketho idinga ukukhiya kwesikrini kwekhophi yasenqolobaneni."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Kukhutshazwe umlawuli, inqubomgomo yokubethela, noma isitoreji sezitifiketi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swayipha"</string>
@@ -1031,6 +1013,8 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"I-SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Ikheli le-MAC ledivayisi"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ikheli le-MAC elingahleliwe"</string>
+    <!-- no translation found for wifi_advanced_randomized_mac_address_disconnected_title (2755843130417523727) -->
+    <skip />
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Ikheli le-IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Imininingwane yenethiwekhi"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Imaski ye-subnet"</string>
@@ -1048,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sicela uthayiphe ikheli le-IP elilungile."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sicela uthayiphe ikheli le-IP elilungile."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sicela uthayiphe ubude bephrifiksi yenethiwekhi phakathi kuka-0 no-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ngaphandle kwalapho uma ikhishwe yi-DNS Eyimfihlo)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ngaphandle kwalapho uma ikhishwe yi-DNS Eyimfihlo)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Indlela yokuphuma"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ubude begama eliqalayo lenethiwekhi"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"I-Wi-Fi eqondile"</string>
@@ -1814,12 +1798,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ukuze usebenzise i-face unlock, setha iphasiwedi"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ukuze usebenzise i-face unlock, setha iphethini"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Ukuze usebenzise i-face unlock, setha iphinikhodi"</string>
-    <!-- no translation found for lockpassword_choose_your_password_header_for_biometrics (9091792721166354172) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pattern_header_for_biometrics (4949972592985176347) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_pin_header_for_biometrics (4215367936503271941) -->
-    <skip />
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ukuze usebenzise i-biometrics, setha iphasiwedi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ukuze usebenzise i-biometrics, setha iphethini"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ukuze usebenzise i-biometrics, setha Iphinikhodi"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ukhohlwe iphasiwedi yakho?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ukhohlwe iphethini yakho?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ukhohlwe iphinikhodi yakho?"</string>
@@ -3052,7 +3033,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ayisethiwe - Iphrofayela yomsebenzi"</string>
     <string name="user_admin" msgid="4024553191395768119">"Mqondisi"</string>
     <string name="user_you" msgid="3070562015202859996">"Wena (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Isidlaliso"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Ungangeza kufikela kubasebenzisi abangu-<xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Umnikazi wethebhulethi kuphela ongaphatha abasebenzisi"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Umnikazi wefoni kuphela ongaphatha abasebenzisi."</string>
@@ -3172,9 +3152,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Phindela emuva"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Okulandelayo"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Qeda"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Thatha isithombe"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Khetha isithombe"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Khetha isithombe"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Imodi yokuthula"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Amakhadi we-SIM"</string>
@@ -3910,12 +3887,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna i-PIN yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa i-PIN ukuze uqale idivayisi yakho?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphethini yakho ngaphambi kokuthi iqale. Idivayisi ize iqale, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa iphethini ukuze uqale idivayisi yakho?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kuqale idivayisi, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa iphasiwedi ukuze uqale idivayisi yakho?"</string>
-    <!-- no translation found for encryption_interstitial_message_pin_for_biometrics (4590004045791674901) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_pattern_for_biometrics (2697768285995352576) -->
-    <skip />
-    <!-- no translation found for encryption_interstitial_message_password_for_biometrics (1895561539964730123) -->
-    <skip />
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ngaphezu kokusebenzisa i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna Iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ingathola amakholi, imilayezo noma izaziso, ezihlanganisa nama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Ingabe udinga Iphinikhodi ukuze uqale idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ngaphezu kokusebenzisa i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphethini yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ingathola amakholi, imilayezo noma izaziso, ezihlanganisa nama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Ingabe udinga iphethini ukuze uqale idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ngokungeziwe ekusebenziseni i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso kuhlanganise nama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Ingabe udinga iphasiwedi ukuze uqalise idivayisi yakho?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yebo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Cha"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Kuvinjelwe"</string>
@@ -4858,6 +4832,11 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ayitholakali uma ixhumeke ku-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Bona okuningi"</string>
     <string name="see_less" msgid="2642392725363552793">"Buka okuncane"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vala i-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vala i-SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ivala i-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="3959790932910391006">"Ayikwazi ukukhubaza inkampani yenethiwekhi"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kukhona okungahambanga kahle futhi inkampani yakho yenethiwekhi ayikwazanga ukukhutshazwa."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Xhuma kudivayisi"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Uhlelo lokusebenza le-<xliff:g id="APPNAME">%1$s</xliff:g> lifuna ukusebenzisa inethiwekhi ye-Wi‑Fi ukuxhuma kudivayisi yakho"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Awekho amadivayisi atholiwe. Yenza isiqinisekiso sokuthi amadivayisi avuliwe futhi ayatholakala ukuze axhumeke."</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 3c58a06..72fbdf2 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -467,4 +467,7 @@
 
     <!-- Whether to show the Preference for Adaptive connectivity -->
     <bool name="config_show_adaptive_connectivity">false</bool>
+
+    <!-- Authority of advanced device battery prediction -->
+    <string name="config_battery_prediction_authority" translatable="false"></string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 799aa22..a561df2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,9 +51,6 @@
     <dimen name="pager_tabs_title_padding">16dp</dimen>
     <dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
 
-    <!-- Minimum width for the popup for updating a user's photo. -->
-    <dimen name="update_user_photo_popup_min_width">300dip</dimen>
-
     <dimen name="captioning_preview_height">200dp</dimen>
 
     <dimen name="autoclick_preview_height">200dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f958e06..8bd7907 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2268,6 +2268,8 @@
     <string name="wifi_advanced_device_mac_address_title">Device MAC address</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the randomized Wi-Fi MAC address. [CHAR LIMIT=50] -->
     <string name="wifi_advanced_randomized_mac_address_title">Randomized MAC address</string>
+    <!-- Wi-Fi settings screen, advanced, title of the item to show the randomized Wi-Fi MAC address when disconnected. [CHAR LIMIT=50] -->
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title">Randomized MAC address (last used)</string>
     <!-- Title of the screen to adjust IP settings -->
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
     <string name="wifi_advanced_ip_address_title">IP address</string>
@@ -2305,9 +2307,9 @@
     <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
     <string name="wifi_ip_settings_invalid_network_prefix_length">Type a network prefix length between 0 and 32.</string>
     <!-- Label for the DNS (first one) -->
-    <string name="wifi_dns1">DNS 1</string>
+    <string name="wifi_dns1">DNS 1 (unless overridden by Private DNS)</string>
     <!-- Label for the DNS (second one)-->
-    <string name="wifi_dns2">DNS 2</string>
+    <string name="wifi_dns2">DNS 2 (unless overridden by Private DNS)</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
     <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
@@ -6990,8 +6992,6 @@
     <string name="user_admin">Admin</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
     <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
-    <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
-    <string name="user_nickname">Nickname</string>
 
     <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
     <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string>
@@ -7429,13 +7429,6 @@
     <!-- Wizard finish button label [CHAR LIMIT=25] -->
     <string name="wizard_finish">Finish</string>
 
-    <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] -->
-    <string name="user_image_take_photo" msgid="7496128293167402354">Take a photo</string>
-    <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] -->
-    <string name="user_image_choose_photo" msgid="3746334626214970837">Choose an image</string>
-    <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
-    <string name="user_image_photo_selector">Select photo</string>
-
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
 
@@ -11926,6 +11919,32 @@
     <!-- See less items in contextual homepage [CHAR LIMIT=30]-->
     <string name="see_less">See less</string>
 
+    <!-- Strings for toggling subscriptions dialog activity -->
+    <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_title">Turn off <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier">Turn off SIM?</string>
+    <!-- Disabling SIMs progress dialog message [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_progress">Turning off SIM<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
+    <!-- Title of error messaging indicating the device could not disable the mobile network. [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_fail_title">Can\'t disable carrier</string>
+    <!-- Body text of error message indicating the device could not disable the mobile network, due to an unknown issue. [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_fail_text">Something went wrong and your carrier could not be disabled.</string>
+
+    <!-- Strings for deleting eUICC subscriptions dialog activity -->
+    <!-- Title on confirmation dialog asking the user if they want to erase the downloaded SIM from the device. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_dialog_title">Erase this downloaded SIM?</string>
+    <!-- Body text in confirmation dialog indicating what erasing a SIM entails. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_dialog_text">Erasing this SIM removes <xliff:g id="carrier_name_a" example="Google Fi">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="carrier_name_b" example="Google Fi">%1$s</xliff:g> won\'t be canceled.</string>
+    <!-- Button label to erase the eSIM [CHAR_LIMIT=20] -->
+    <string name="erase_sim_confirm_button">Erase</string>
+    <!-- Status message indicating the device is in the process of erasing the SIM. [CHAR_LIMIT=NONE] -->
+    <string name="erasing_sim">Erasing SIM&#8230;</string>
+    <!-- Title of error message indicating the device could not erase the SIM. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_fail_title">Can\'t erase SIM</string>
+    <!-- Body text of error message indicating the device could not erase the SIM due to an error. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_fail_text">This SIM can\'t be erased due to an error.\n\nRestart your device and try again.</string>
+
     <!-- Title for Network connection request Dialog [CHAR LIMIT=60] -->
     <string name="network_connection_request_dialog_title">Connect to device</string>
     <!-- Summary for Network connection request Dialog [CHAR LIMIT=NONE] -->
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
new file mode 100644
index 0000000..964c198
--- /dev/null
+++ b/res/xml/top_level_settings_grouped.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="top_level_settings_grouped">
+
+    <PreferenceCategory
+        android:key="connectivity"
+        android:order="-120"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.network.NetworkDashboardFragment"
+            android:icon="@drawable/ic_homepage_network"
+            android:key="top_level_network"
+            android:order="-120"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/network_dashboard_title"
+            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+            android:icon="@drawable/ic_homepage_connected_device"
+            android:key="top_level_connected_devices"
+            android:order="-110"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/connected_devices_dashboard_title"
+            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="apps"
+        android:order="-100"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
+            android:icon="@drawable/ic_homepage_apps"
+            android:key="top_level_apps_and_notifs"
+            android:order="-100"
+            android:summary="@string/app_and_notification_dashboard_summary"
+            android:title="@string/app_and_notification_dashboard_title"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="phone_essential"
+        android:order="-90"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+            android:icon="@drawable/ic_homepage_battery"
+            android:key="top_level_battery"
+            android:order="-90"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/power_usage_summary_title"
+            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.deviceinfo.StorageSettings"
+            android:icon="@drawable/ic_homepage_storage"
+            android:key="top_level_storage"
+            android:order="-80"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/storage_settings"
+            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.notification.SoundSettings"
+            android:icon="@drawable/ic_homepage_sound"
+            android:key="top_level_sound"
+            android:order="-70"
+            android:summary="@string/sound_dashboard_summary"
+            android:title="@string/sound_settings"/>
+
+        <Preference
+            android:fragment="com.android.settings.DisplaySettings"
+            android:icon="@drawable/ic_homepage_display"
+            android:key="top_level_display"
+            android:order="-60"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/display_settings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            android:icon="@drawable/ic_homepage_accessibility"
+            android:key="top_level_accessibility"
+            android:order="-50"
+            android:summary="@string/accessibility_settings_summary"
+            android:title="@string/accessibility_settings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="privacy_and_security"
+        android:order="-40"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            android:icon="@drawable/ic_homepage_privacy"
+            android:key="top_level_privacy"
+            android:order="-40"
+            android:summary="@string/privacy_dashboard_summary"
+            android:title="@string/privacy_dashboard_title"/>
+
+        <Preference
+            android:fragment="com.android.settings.location.LocationSettings"
+            android:icon="@drawable/ic_homepage_location"
+            android:key="top_level_location"
+            android:order="-30"
+            android:summary="@string/location_settings_loading_app_permission_stats"
+            android:title="@string/location_settings_title"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.security.SecuritySettings"
+            android:icon="@drawable/ic_homepage_security"
+            android:key="top_level_security"
+            android:order="-20"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/security_settings_title"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="accounts"
+        android:order="-10"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            android:icon="@drawable/ic_homepage_accounts"
+            android:key="top_level_accounts"
+            android:order="-10"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/account_dashboard_title"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="system"
+        android:order="10"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            android:icon="@drawable/ic_homepage_system_dashboard"
+            android:key="top_level_system"
+            android:order="10"
+            android:summary="@string/system_dashboard_summary"
+            android:title="@string/header_category_system"/>
+
+        <Preference
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            android:icon="@drawable/ic_homepage_about"
+            android:key="top_level_about_device"
+            android:order="20"
+            android:summary="@string/summary_placeholder"
+            android:title="@string/about_settings"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+
+        <Preference
+            android:icon="@drawable/ic_homepage_support"
+            android:key="top_level_support"
+            android:order="100"
+            android:summary="@string/support_summary"
+            android:title="@string/page_tab_title_support"
+            settings:controller="com.android.settings.support.SupportPreferenceController"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 53fe369..97139c4 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -49,7 +49,7 @@
 
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 /**
diff --git a/src/com/android/settings/SidecarFragment.java b/src/com/android/settings/SidecarFragment.java
new file mode 100644
index 0000000..1a69c03
--- /dev/null
+++ b/src/com/android/settings/SidecarFragment.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.IntDef;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Locale;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * A headless fragment encapsulating a long-running action such as a network RPC surviving rotation.
+ *
+ * <p>Subclasses should implement their own state machine, updating the state on each state change
+ * via {@link #setState(int, int)}. They can define their own states, however, it is suggested that
+ * the pre-defined {@link @State} constants are used and customizations are implemented via
+ * substates. Custom states must be outside the range of pre-defined states.
+ *
+ * <p>It is safe to update the state at any time, but state updates must originate from the main
+ * thread.
+ *
+ * <p>A listener can be attached that receives state updates while it's registered. Note that state
+ * change events can occur at any point in time and hence a registered listener should unregister if
+ * it cannot act upon the state change (typically a non-resumed fragment).
+ *
+ * <p>Listeners can receive state changes for the same state/substate combination, so listeners
+ * should make sure to be idempotent during state change events.
+ *
+ * <p>If a SidecarFragment is only relevant during the lifetime of another fragment (for example, a
+ * sidecar performing a details request for a DetailsFragment), that fragment needs to become the
+ * managing fragment of the sidecar.
+ *
+ * <h2>Managing fragment responsibilities</h2>
+ *
+ * <ol>
+ *   <li>Instantiates the sidecar fragment when necessary, preferably in {@link #onStart}.
+ *   <li>Removes the sidecar fragment when it's no longer used or when itself is removed. Removal of
+ *       the managing fragment can be detected by checking {@link #isRemoving} in {@link #onStop}.
+ *       <br>
+ *   <li>Registers as a listener in {@link #onResume()}, unregisters in {@link #onPause()}.
+ *   <li>Starts the long-running operation by calling into the sidecar.
+ *   <li>Receives state updates via {@link Listener#onStateChange(SidecarFragment)} and updates the
+ *       UI accordingly.
+ * </ol>
+ *
+ * <h2>Managing fragment example</h2>
+ *
+ * <pre>
+ *     public class MainFragment implements SidecarFragment.Listener {
+ *         private static final String TAG_SOME_SIDECAR = ...;
+ *         private static final String KEY_SOME_SIDECAR_STATE = ...;
+ *
+ *         private SomeSidecarFragment mSidecar;
+ *
+ *         &#064;Override
+ *         public void onStart() {
+ *             super.onStart();
+ *             Bundle args = ...; // optional args
+ *             mSidecar = SidecarFragment.get(getFragmentManager(), TAG_SOME_SIDECAR,
+ *                     SidecarFragment.class, args);
+ *         }
+ *
+ *         &#064;Override
+ *         public void onResume() {
+ *             mSomeSidecar.addListener(this);
+ *         }
+ *
+ *         &#064;Override
+ *         public void onPause() {
+ *             mSomeSidecar.removeListener(this):
+ *         }
+ *     }
+ * </pre>
+ */
+public class SidecarFragment extends Fragment {
+
+    private static final String TAG = "SidecarFragment";
+
+    /**
+     * Get an instance of this sidecar.
+     *
+     * <p>Will return the existing instance if one is already present. Note that the args will not
+     * be used in this situation, so args must be constant for any particular fragment manager and
+     * tag.
+     */
+    @SuppressWarnings("unchecked")
+    protected static <T extends SidecarFragment> T get(
+            FragmentManager fm, String tag, Class<T> clazz, Bundle args) {
+        T fragment = (T) fm.findFragmentByTag(tag);
+        if (fragment == null) {
+            try {
+                fragment = clazz.newInstance();
+            } catch (java.lang.InstantiationException e) {
+                throw new InstantiationException("Unable to create fragment", e);
+            } catch (IllegalAccessException e) {
+                throw new IllegalArgumentException("Unable to create fragment", e);
+            }
+            if (args != null) {
+                fragment.setArguments(args);
+            }
+            fm.beginTransaction().add(fragment, tag).commit();
+            // No real harm in doing this here - get() should generally only be called from onCreate
+            // which is on the main thread - and it allows us to start running the sidecar on this
+            // instance immediately rather than having to wait until the transaction commits.
+            fm.executePendingTransactions();
+        }
+
+        return fragment;
+    }
+
+    /** State definitions. @see {@link #getState} */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({State.INIT, State.RUNNING, State.SUCCESS, State.ERROR})
+    public @interface State {
+        /** Initial idling state. */
+        int INIT = 0;
+
+        /** The long-running operation is in progress. */
+        int RUNNING = 1;
+
+        /** The long-running operation has succeeded. */
+        int SUCCESS = 2;
+
+        /** The long-running operation has failed. */
+        int ERROR = 3;
+    }
+
+    /** Substate definitions. @see {@link #getSubstate} */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        Substate.UNUSED,
+        Substate.RUNNING_BIND_SERVICE,
+        Substate.RUNNING_GET_ACTIVATION_CODE,
+    })
+    public @interface Substate {
+        // Unknown/unused substate.
+        int UNUSED = 0;
+        int RUNNING_BIND_SERVICE = 1;
+        int RUNNING_GET_ACTIVATION_CODE = 2;
+
+        // Future tags: 3+
+    }
+
+    /** **************************************** */
+    private Set<Listener> mListeners = new CopyOnWriteArraySet<>();
+
+    // Used to track whether onCreate has been called yet.
+    private boolean mCreated;
+
+    @State private int mState;
+    @Substate private int mSubstate;
+
+    /** A listener receiving state change events. */
+    public interface Listener {
+
+        /**
+         * Called upon any state or substate change.
+         *
+         * <p>The new state can be queried through {@link #getState} and {@link #getSubstate}.
+         *
+         * <p>Called from the main thread.
+         *
+         * @param fragment the SidecarFragment that changed its state
+         */
+        void onStateChange(SidecarFragment fragment);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        mCreated = true;
+        setState(State.INIT, Substate.UNUSED);
+    }
+
+    @Override
+    public void onDestroy() {
+        mCreated = false;
+        super.onDestroy();
+    }
+
+    /**
+     * Registers a listener that will receive subsequent state changes.
+     *
+     * <p>A {@link Listener#onStateChange(SidecarFragment)} event is fired as part of this call
+     * unless {@link #onCreate} has not yet been called (which means that it's unsafe to access this
+     * fragment as it has not been setup or restored completely). In that case, the future call to
+     * onCreate will trigger onStateChange on registered listener.
+     *
+     * <p>Must be called from the main thread.
+     *
+     * @param listener a listener, or null for unregistering the current listener
+     */
+    public void addListener(Listener listener) {
+        ThreadUtils.ensureMainThread();
+        mListeners.add(listener);
+        if (mCreated) {
+            notifyListener(listener);
+        }
+    }
+
+    /**
+     * Removes a previously registered listener.
+     *
+     * @return {@code true} if the listener was removed, {@code false} if there was no such listener
+     *     registered.
+     */
+    public boolean removeListener(Listener listener) {
+        ThreadUtils.ensureMainThread();
+        return mListeners.remove(listener);
+    }
+
+    /** Returns the current state. */
+    @State
+    public int getState() {
+        return mState;
+    }
+
+    /** Returns the current substate. */
+    @Substate
+    public int getSubstate() {
+        return mSubstate;
+    }
+
+    /**
+     * Resets the sidecar to its initial state.
+     *
+     * <p>Implementers can override this method to perform additional reset tasks, but must call the
+     * super method.
+     */
+    @CallSuper
+    public void reset() {
+        setState(State.INIT, Substate.UNUSED);
+    }
+
+    /**
+     * Updates the state and substate and notifies the registered listener.
+     *
+     * <p>Must be called from the main thread.
+     *
+     * @param state the state to transition to
+     * @param substate the substate to transition to
+     */
+    protected void setState(@State int state, @Substate int substate) {
+        ThreadUtils.ensureMainThread();
+
+        mState = state;
+        mSubstate = substate;
+        notifyAllListeners();
+        printState();
+    }
+
+    private void notifyAllListeners() {
+        for (Listener listener : mListeners) {
+            notifyListener(listener);
+        }
+    }
+
+    private void notifyListener(Listener listener) {
+        listener.onStateChange(this);
+    }
+
+    /** Prints the state of the sidecar. */
+    public void printState() {
+        StringBuilder sb =
+                new StringBuilder("SidecarFragment.setState(): Sidecar Class: ")
+                        .append(getClass().getCanonicalName());
+        sb.append(", State: ");
+        switch (mState) {
+            case SidecarFragment.State.INIT:
+                sb.append("State.INIT");
+                break;
+            case SidecarFragment.State.RUNNING:
+                sb.append("State.RUNNING");
+                break;
+            case SidecarFragment.State.SUCCESS:
+                sb.append("State.SUCCESS");
+                break;
+            case SidecarFragment.State.ERROR:
+                sb.append("State.ERROR");
+                break;
+            default:
+                sb.append(mState);
+                break;
+        }
+        switch (mSubstate) {
+            case SidecarFragment.Substate.UNUSED:
+                sb.append(", Substate.UNUSED");
+                break;
+            default:
+                sb.append(", ").append(mSubstate);
+                break;
+        }
+
+        Log.v(TAG, sb.toString());
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+                Locale.US,
+                "SidecarFragment[mState=%d, mSubstate=%d]: %s",
+                mState,
+                mSubstate,
+                super.toString());
+    }
+
+    /** The State of the sidecar status. */
+    public static final class States {
+        public static final States SUCCESS = States.create(State.SUCCESS, Substate.UNUSED);
+        public static final States ERROR = States.create(State.ERROR, Substate.UNUSED);
+
+        @State public final int state;
+        @Substate public final int substate;
+
+        /** Creates a new sidecar state. */
+        public static States create(@State int state, @Substate int substate) {
+            return new States(state, substate);
+        }
+
+        public States(@State int state, @Substate int substate) {
+            this.state = state;
+            this.substate = substate;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof States)) {
+                return false;
+            }
+            States other = (States) o;
+            return this.state == other.state && this.substate == other.substate;
+        }
+
+        @Override
+        public int hashCode() {
+            return state * 31 + substate;
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index ccc7d60..b2c3c4d 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -98,12 +98,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
diff --git a/src/com/android/settings/accessibility/PreferredShortcut.java b/src/com/android/settings/accessibility/PreferredShortcut.java
new file mode 100644
index 0000000..1654992
--- /dev/null
+++ b/src/com/android/settings/accessibility/PreferredShortcut.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.text.TextUtils;
+
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
+import com.google.common.base.Objects;
+
+/**
+ * A data class for containing {@link ComponentName#flattenToString()} and
+ * {@link UserShortcutType}. Represents the preferred shortcuts of the service or activity.
+ */
+public class PreferredShortcut {
+
+    private static final char COMPONENT_NAME_SEPARATOR = ':';
+    private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
+            new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
+
+    /**
+     * Creates a {@link PreferredShortcut} from a encoded string described in {@link #toString()}.
+     *
+     * @param preferredShortcutString A string conform to the format described in {@link
+     *                                #toString()}
+     * @return A {@link PreferredShortcut} with the specified value
+     * @throws IllegalArgumentException If preferredShortcutString does not conform to the format
+     *                                  described in {@link #toString()}
+     */
+    public static PreferredShortcut fromString(String preferredShortcutString) {
+        sStringColonSplitter.setString(preferredShortcutString);
+        if (sStringColonSplitter.hasNext()) {
+            final String componentName = sStringColonSplitter.next();
+            final int type = Integer.parseInt(sStringColonSplitter.next());
+            return new PreferredShortcut(componentName, type);
+        }
+
+        throw new IllegalArgumentException(
+                "Invalid PreferredShortcut string: " + preferredShortcutString);
+    }
+
+    /** The format of {@link ComponentName#flattenToString()} */
+    private String mComponentName;
+    /** The format of {@link UserShortcutType} */
+    private int mType;
+
+    public PreferredShortcut(String componentName, int type) {
+        mComponentName = componentName;
+        mType = type;
+    }
+
+    public String getComponentName() {
+        return mComponentName;
+    }
+
+    public int getType() {
+        return mType;
+    }
+
+    @Override
+    public String toString() {
+        return mComponentName + COMPONENT_NAME_SEPARATOR + mType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        PreferredShortcut that = (PreferredShortcut) o;
+        return mType == that.mType && Objects.equal(mComponentName, that.mComponentName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(mComponentName, mType);
+    }
+}
diff --git a/src/com/android/settings/accessibility/PreferredShortcuts.java b/src/com/android/settings/accessibility/PreferredShortcuts.java
new file mode 100644
index 0000000..2c9840d
--- /dev/null
+++ b/src/com/android/settings/accessibility/PreferredShortcuts.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/** Static utility methods relating to {@link PreferredShortcut} */
+public final class PreferredShortcuts {
+
+    private static final String ACCESSIBILITY_PERF = "accessibility_prefs";
+    private static final String USER_SHORTCUT_TYPE = "user_shortcut_type";
+
+    /**
+     * Retrieves {@link UserShortcutType} for the given {@code componentName} from
+     * SharedPreferences.
+     *
+     * @param context       {@link Context} to access the {@link SharedPreferences}
+     * @param componentName Name of the service or activity, should be the format of {@link
+     *                      ComponentName#flattenToString()}.
+     * @param defaultType   See {@link UserShortcutType}
+     * @return {@link UserShortcutType}
+     */
+    public static int retrieveUserShortcutType(Context context, String componentName,
+            int defaultType) {
+        if (componentName == null) {
+            return defaultType;
+        }
+
+        // Create a mutable set to modify
+        final Set<String> info = new HashSet<>(getFromSharedPreferences(context));
+        info.removeIf(str -> !str.contains(componentName));
+
+        if (info.isEmpty()) {
+            return defaultType;
+        }
+
+        final String str = info.stream().findFirst().get();
+        final PreferredShortcut shortcut = PreferredShortcut.fromString(str);
+        return shortcut.getType();
+    }
+
+    /**
+     * Saves a {@link PreferredShortcut} which containing {@link ComponentName#flattenToString()}
+     * and {@link UserShortcutType} in SharedPreferences.
+     *
+     * @param context  {@link Context} to access the {@link SharedPreferences}
+     * @param shortcut Contains {@link ComponentName#flattenToString()} and {@link UserShortcutType}
+     */
+    public static void saveUserShortcutType(Context context, PreferredShortcut shortcut) {
+        final String componentName = shortcut.getComponentName();
+        if (componentName == null) {
+            return;
+        }
+
+        // Create a mutable set to modify
+        final Set<String> info = new HashSet<>(getFromSharedPreferences(context));
+        info.removeIf(str -> str.contains(componentName));
+        info.add(shortcut.toString());
+        saveToSharedPreferences(context, info);
+    }
+
+    /**
+     * Returns a immutable set of {@link PreferredShortcut#toString()} list from
+     * SharedPreferences.
+     */
+    private static Set<String> getFromSharedPreferences(Context context) {
+        return getSharedPreferences(context).getStringSet(USER_SHORTCUT_TYPE, Set.of());
+    }
+
+    /** Sets a set of {@link PreferredShortcut#toString()} list into SharedPreferences. */
+    private static void saveToSharedPreferences(Context context, Set<String> data) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putStringSet(USER_SHORTCUT_TYPE, data).apply();
+    }
+
+    private static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(ACCESSIBILITY_PERF, Context.MODE_PRIVATE);
+    }
+
+    private PreferredShortcuts() {}
+}
diff --git a/src/com/android/settings/accessibility/SharedPreferenceUtils.java b/src/com/android/settings/accessibility/SharedPreferenceUtils.java
deleted file mode 100644
index e997291..0000000
--- a/src/com/android/settings/accessibility/SharedPreferenceUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.google.common.collect.ImmutableSet;
-
-import java.util.Set;
-
-/** Utility class for SharedPreferences. */
-public final class SharedPreferenceUtils {
-
-    private static final String ACCESSIBILITY_PERF = "accessibility_prefs";
-    private static final String USER_SHORTCUT_TYPE = "user_shortcut_type";
-    private SharedPreferenceUtils() { }
-
-    private static SharedPreferences getSharedPreferences(Context context, String fileName) {
-        return context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
-    }
-
-    /** Returns a set of user shortcuts list to determine user preferred service shortcut. */
-    public static Set<String> getUserShortcutTypes(Context context) {
-        return getSharedPreferences(context, ACCESSIBILITY_PERF)
-                .getStringSet(USER_SHORTCUT_TYPE, ImmutableSet.of());
-    }
-
-    /** Sets a set of user shortcuts list to determine user preferred service shortcut. */
-    public static void setUserShortcutType(Context context, Set<String> data) {
-        SharedPreferences.Editor editor = getSharedPreferences(context, ACCESSIBILITY_PERF).edit();
-        editor.remove(USER_SHORTCUT_TYPE).apply();
-        editor.putStringSet(USER_SHORTCUT_TYPE, data).apply();
-    }
-}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f892c50..c0de313 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility;
 
 import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
+import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
@@ -292,7 +293,8 @@
 
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             if (!mToggleServiceDividerSwitchPreference.isChecked()) {
                 preference.setChecked(false);
@@ -311,7 +313,12 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
+        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
+        mUserShortcutTypesCache = mShortcutPreference.isChecked()
+                ? retrieveUserShortcutType(getPrefContext(), mComponentName.flattenToString(),
+                UserShortcutType.SOFTWARE)
+                : UserShortcutType.EMPTY;
+
         final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
                 || mToggleServiceDividerSwitchPreference.isChecked();
         showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
@@ -411,7 +418,8 @@
     private void onAllowButtonFromShortcutToggleClicked() {
         mShortcutPreference.setChecked(true);
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes, mComponentName);
 
         mIsDialogShown.set(false);
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index dfdcd9e..a45cd49 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -123,12 +123,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 6c47dc3..3fb9b38 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -195,12 +195,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 56f6733..678ef13 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -18,6 +18,8 @@
 
 import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
 import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
+import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
+import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -44,6 +46,7 @@
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
@@ -60,12 +63,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Base class for accessibility fragments with toggle, shortcut, some helper functions
@@ -87,19 +86,24 @@
     protected Uri mImageUri;
     private CharSequence mDescription;
     protected CharSequence mHtmlDescription;
-    // Used to restore the edit dialog status.
-    protected int mUserShortcutTypesCache = UserShortcutType.EMPTY;
+
     private static final String DRAWABLE_FOLDER = "drawable";
     protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";
     protected static final String KEY_GENERAL_CATEGORY = "general_categories";
     protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+    @VisibleForTesting
+    static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
-    private int mUserShortcutTypes = UserShortcutType.EMPTY;
+    private SettingsContentObserver mSettingsContentObserver;
+
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
-    private SettingsContentObserver mSettingsContentObserver;
+
+    // Used to restore the edit dialog status.
+    protected int mUserShortcutTypesCache = UserShortcutType.EMPTY;
+    protected int mUserShortcutTypes = UserShortcutType.EMPTY;
 
     // For html description of accessibility service, must follow the rule, such as
     // <img src="R.drawable.fileName"/>, a11y settings will get the resources successfully.
@@ -121,6 +125,12 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
+            mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
+                    UserShortcutType.EMPTY);
+        }
+
         setupDefaultShortcutIfNecessary(getPrefContext());
         final int resId = getPreferenceScreenResId();
         if (resId <= 0) {
@@ -150,7 +160,7 @@
         initAnimatedImagePreference();
         initToggleServiceDividerSwitchPreference();
         initGeneralCategory();
-        initShortcutPreference(savedInstanceState);
+        initShortcutPreference();
         initSettingsPreference();
         initHtmlTextPreference();
         initFooterPreference();
@@ -468,51 +478,6 @@
         }
     }
 
-    static final class AccessibilityUserShortcutType {
-        private static final char COMPONENT_NAME_SEPARATOR = ':';
-        private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
-                new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
-
-        private String mComponentName;
-        private int mType;
-
-        AccessibilityUserShortcutType(String componentName, int type) {
-            this.mComponentName = componentName;
-            this.mType = type;
-        }
-
-        AccessibilityUserShortcutType(String flattenedString) {
-            sStringColonSplitter.setString(flattenedString);
-            if (sStringColonSplitter.hasNext()) {
-                this.mComponentName = sStringColonSplitter.next();
-                this.mType = Integer.parseInt(sStringColonSplitter.next());
-            }
-        }
-
-        String getComponentName() {
-            return mComponentName;
-        }
-
-        void setComponentName(String componentName) {
-            this.mComponentName = componentName;
-        }
-
-        int getType() {
-            return mType;
-        }
-
-        void setType(int type) {
-            this.mType = type;
-        }
-
-        String flattenToString() {
-            final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-            joiner.add(mComponentName);
-            joiner.add(String.valueOf(mType));
-            return joiner.toString();
-        }
-    }
-
     private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
         final View dialogTextArea = dialogView.findViewById(R.id.container);
         dialogTextArea.setOnClickListener(v -> {
@@ -521,7 +486,8 @@
         });
     }
 
-    private void initializeDialogCheckBox(Dialog dialog) {
+    @VisibleForTesting
+    void initializeDialogCheckBox(Dialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -544,7 +510,8 @@
         checkBox.setChecked((mUserShortcutTypesCache & type) == type);
     }
 
-    private void updateUserShortcutType(boolean saveChanges) {
+    @VisibleForTesting
+    void updateUserShortcutType(boolean saveChanges) {
         mUserShortcutTypesCache = UserShortcutType.EMPTY;
         if (mSoftwareTypeCheckBox.isChecked()) {
             mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
@@ -556,33 +523,14 @@
         if (saveChanges) {
             final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
             if (isChanged) {
-                setUserShortcutType(getPrefContext(), mUserShortcutTypesCache);
+                final PreferredShortcut shortcut = new PreferredShortcut(
+                        mComponentName.flattenToString(), mUserShortcutTypesCache);
+                saveUserShortcutType(getPrefContext(), shortcut);
             }
             mUserShortcutTypes = mUserShortcutTypesCache;
         }
     }
 
-    private void setUserShortcutType(Context context, int type) {
-        if (mComponentName == null) {
-            return;
-        }
-
-        Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final String componentName = mComponentName.flattenToString();
-        if (info.isEmpty()) {
-            info = new HashSet<>();
-        } else {
-            final Set<String> filtered = info.stream()
-                    .filter(str -> str.contains(componentName))
-                    .collect(Collectors.toSet());
-            info.removeAll(filtered);
-        }
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                componentName, type);
-        info.add(shortcut.flattenToString());
-        SharedPreferenceUtils.setUserShortcutType(context, info);
-    }
-
     protected CharSequence getShortcutTypeSummary(Context context) {
         if (!mShortcutPreference.isSettingsEditable()) {
             return context.getText(R.string.accessibility_shortcut_edit_dialog_title_hardware);
@@ -592,7 +540,8 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutTypes = getUserShortcutTypes(context, UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(context,
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
             resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -621,25 +570,6 @@
                 null, joinStrings);
     }
 
-    protected int getUserShortcutTypes(Context context, @UserShortcutType int defaultValue) {
-        if (mComponentName == null) {
-            return defaultValue;
-        }
-
-        final Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final String componentName = mComponentName.flattenToString();
-        final Set<String> filtered = info.stream()
-                .filter(str -> str.contains(componentName))
-                .collect(Collectors.toSet());
-        if (filtered.isEmpty()) {
-            return defaultValue;
-        }
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        return shortcut.getType();
-    }
-
     /**
      * This method will be invoked when a button in the edit shortcut dialog is clicked.
      *
@@ -670,20 +600,17 @@
         mUserShortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
         if (mUserShortcutTypes != UserShortcutType.EMPTY) {
-            setUserShortcutType(getPrefContext(), mUserShortcutTypes);
+            final PreferredShortcut shortcut = new PreferredShortcut(
+                    mComponentName.flattenToString(), mUserShortcutTypes);
+            saveUserShortcutType(getPrefContext(), shortcut);
         } else {
             //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+            mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                    mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         }
     }
 
-    protected void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the user shortcut type.
-        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
-            mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    UserShortcutType.EMPTY);
-        }
-
+    protected void initShortcutPreference() {
         // Initial the shortcut preference.
         mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
         mShortcutPreference.setPersistent(false);
@@ -702,10 +629,11 @@
             return;
         }
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
-                    AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
-                            mComponentName));
+                AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
+                        mComponentName));
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
@@ -719,7 +647,8 @@
             return;
         }
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
                     mComponentName);
@@ -735,8 +664,10 @@
     public void onSettingsClicked(ShortcutPreference preference) {
         // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
         mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE)
+                ? retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE)
                 : UserShortcutType.EMPTY;
+        showDialog(DialogEnums.EDIT_SHORTCUT);
     }
 
     private void createFooterPreference(CharSequence title) {
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 6a6df33..d470bef 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -19,6 +19,8 @@
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
+import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -46,12 +48,9 @@
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Fragment that shows the actual UI for providing basic magnification accessibility service setup
@@ -62,7 +61,7 @@
 
     private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
-    private int mUserShortcutType = UserShortcutType.EMPTY;
+
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
     private CheckBox mTripleTapTypeCheckBox;
@@ -158,7 +157,8 @@
         generalCategory.addPreference(mSettingsPreference);
     }
 
-    private void initializeDialogCheckBox(AlertDialog dialog) {
+    @VisibleForTesting
+    void initializeDialogCheckBox(AlertDialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -193,7 +193,8 @@
         checkBox.setChecked((mUserShortcutTypesCache & type) == type);
     }
 
-    private void updateUserShortcutType(boolean saveChanges) {
+    @VisibleForTesting
+    void updateUserShortcutType(boolean saveChanges) {
         mUserShortcutTypesCache = UserShortcutType.EMPTY;
         if (mSoftwareTypeCheckBox.isChecked()) {
             mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
@@ -208,35 +209,22 @@
         if (saveChanges) {
             final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
             if (isChanged) {
-                setUserShortcutType(getPrefContext(), mUserShortcutTypesCache);
+                final PreferredShortcut shortcut = new PreferredShortcut(
+                        MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypesCache);
+                saveUserShortcutType(getPrefContext(), shortcut);
             }
-            mUserShortcutType = mUserShortcutTypesCache;
+            mUserShortcutTypes = mUserShortcutTypesCache;
         }
     }
 
-    private void setUserShortcutType(Context context, int type) {
-        Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        if (info.isEmpty()) {
-            info = new HashSet<>();
-        } else {
-            final Set<String> filtered = info.stream().filter(
-                    str -> str.contains(MAGNIFICATION_CONTROLLER_NAME)).collect(
-                    Collectors.toSet());
-            info.removeAll(filtered);
-        }
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                MAGNIFICATION_CONTROLLER_NAME, type);
-        info.add(shortcut.flattenToString());
-        SharedPreferenceUtils.setUserShortcutType(context, info);
-    }
-
     @Override
     protected CharSequence getShortcutTypeSummary(Context context) {
         if (!mShortcutPreference.isChecked()) {
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutType = getUserShortcutTypes(context, UserShortcutType.EMPTY);
+        final int shortcutType = retrieveUserShortcutType(context, MAGNIFICATION_CONTROLLER_NAME,
+                UserShortcutType.EMPTY);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
             resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -272,26 +260,11 @@
     }
 
     @Override
-    protected int getUserShortcutTypes(Context context, @UserShortcutType int defaultValue) {
-        final Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final Set<String> filtered = info.stream().filter(
-                str -> str.contains(MAGNIFICATION_CONTROLLER_NAME)).collect(
-                Collectors.toSet());
-        if (filtered.isEmpty()) {
-            return defaultValue;
-        }
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        return shortcut.getType();
-    }
-
-    @Override
     protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
         updateUserShortcutType(/* saveChanges= */ true);
-        optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutType);
-        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutType);
-        mShortcutPreference.setChecked(mUserShortcutType != UserShortcutType.EMPTY);
+        optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutTypes);
+        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutTypes);
+        mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
@@ -339,7 +312,8 @@
 
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             optInAllMagnificationValuesToSettings(getPrefContext(), shortcutTypes);
             showDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
@@ -353,7 +327,8 @@
     public void onSettingsClicked(ShortcutPreference preference) {
         // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
         mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE)
+                ? retrieveUserShortcutType(getPrefContext(),
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE)
                 : UserShortcutType.EMPTY;
         showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
     }
@@ -361,17 +336,20 @@
     @Override
     protected void updateShortcutPreferenceData() {
         // Get the user shortcut type from settings provider.
-        mUserShortcutType = getUserShortcutTypeFromSettings(getPrefContext());
-        if (mUserShortcutType != UserShortcutType.EMPTY) {
-            setUserShortcutType(getPrefContext(), mUserShortcutType);
+        mUserShortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
+        if (mUserShortcutTypes != UserShortcutType.EMPTY) {
+            final PreferredShortcut shortcut = new PreferredShortcut(
+                    MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypes);
+            saveUserShortcutType(getPrefContext(), shortcut);
         } else {
             //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutType = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+            mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                    MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         }
     }
 
     @Override
-    protected void initShortcutPreference(Bundle savedInstanceState) {
+    protected void initShortcutPreference() {
         mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
         mShortcutPreference.setPersistent(false);
         mShortcutPreference.setKey(getShortcutPreferenceKey());
@@ -387,7 +365,8 @@
 
     @Override
     protected void updateShortcutPreference() {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
                 hasMagnificationValuesInSettings(getPrefContext(), shortcutTypes));
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index 31f97a8..eccfbce 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -24,8 +24,6 @@
 
 import com.android.settings.R;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Fragment that only allowed hardware {@link UserShortcutType} for shortcut to open.
  *
@@ -67,10 +65,9 @@
     }
 
     private void setAllowedPreferredShortcutType(int type) {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                mComponentName.flattenToString(), type);
+        final String componentNameString = mComponentName.flattenToString();
+        final PreferredShortcut shortcut = new PreferredShortcut(componentNameString, type);
 
-        SharedPreferenceUtils.setUserShortcutType(getPrefContext(),
-                ImmutableSet.of(shortcut.flattenToString()));
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
     }
 }
diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
index fe1d81c..b723274 100644
--- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
@@ -18,7 +18,6 @@
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
-import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -30,7 +29,6 @@
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.applications.AppInfoWithHeader;
@@ -46,7 +44,6 @@
 
     private AppStateInstallAppsBridge mAppBridge;
     private AppOpsManager mAppOpsManager;
-    private ActivityManager mActivityManager;
     private UserManager mUserManager;
     private RestrictedSwitchPreference mSwitchPref;
     private InstallAppsState mInstallAppsState;
@@ -58,7 +55,6 @@
         final Context context = getActivity();
         mAppBridge = new AppStateInstallAppsBridge(context, mState, null);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-        mActivityManager = context.getSystemService(ActivityManager.class);
         mUserManager = UserManager.get(context);
 
         addPreferencesFromResource(R.xml.external_sources_details);
@@ -103,21 +99,10 @@
                 : R.string.app_permission_summary_not_allowed);
     }
 
-    @VisibleForTesting
-    void setCanInstallApps(boolean newState) {
+    private void setCanInstallApps(boolean newState) {
         mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES,
                 mPackageInfo.applicationInfo.uid, mPackageName,
                 newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        if (!newState) {
-            killApp(mPackageInfo.applicationInfo.uid);
-        }
-    }
-
-    private void killApp(int uid) {
-        if (UserHandle.isCore(uid)) {
-            return;
-        }
-        mActivityManager.killUid(uid, "User denied OP_REQUEST_INSTALL_PACKAGES");
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index bfdcd5b..791efa7 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -25,9 +25,9 @@
 import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricManager.Authenticators;
 import android.hardware.face.FaceManager;
-import android.hardware.face.FaceSensorProperties;
+import android.hardware.face.FaceSensorPropertiesInternal;
 import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -233,13 +233,14 @@
 
         final FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class);
         final FaceManager faceManager = getSystemService(FaceManager.class);
-        final List<FingerprintSensorProperties> fpProperties =
-                fingerprintManager.getSensorProperties();
-        final List<FaceSensorProperties> faceProperties = faceManager.getSensorProperties();
+        final List<FingerprintSensorPropertiesInternal> fpProperties =
+                fingerprintManager.getSensorPropertiesInternal();
+        final List<FaceSensorPropertiesInternal> faceProperties =
+                faceManager.getSensorPropertiesInternal();
 
         // This would need to be updated for devices with multiple sensors of the same modality
         final boolean maxFacesEnrolled = faceManager.getEnrolledFaces(mUserId).size()
-                >= faceProperties.get(0).maxTemplatesAllowed;
+                >= faceProperties.get(0).maxEnrollmentsPerUser;
         final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId)
                 .size() >= fpProperties.get(0).maxEnrollmentsPerUser;
 
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 55a56ed..3bffbbf 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -16,15 +16,12 @@
 
 package com.android.settings.biometrics.face;
 
-import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.hardware.face.FaceManager;
-import android.hardware.face.FaceSensorProperties;
+import android.hardware.face.FaceSensorPropertiesInternal;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -32,7 +29,6 @@
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
 import com.android.settings.biometrics.BiometricUtils;
-import com.android.settings.biometrics.MultiBiometricEnrollHelper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -173,9 +169,10 @@
 
     private boolean maxFacesEnrolled() {
         if (mFaceManager != null) {
-            final List<FaceSensorProperties> props = mFaceManager.getSensorProperties();
+            final List<FaceSensorPropertiesInternal> props =
+                    mFaceManager.getSensorPropertiesInternal();
             // This will need to be updated for devices with multiple face sensors.
-            final int max = props.get(0).maxTemplatesAllowed;
+            final int max = props.get(0).maxEnrollmentsPerUser;
             final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size();
             return numEnrolledFaces >= max;
         } else {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 7b65924..813c384 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -139,7 +139,9 @@
         mVibrator = getSystemService(Vibrator.class);
 
         if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
-            DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage);
+            DescriptionStyler.applyPartnerCustomizationHeavyStyle(mRepeatMessage);
+        } else if (getLayout().shouldApplyPartnerResource()) {
+            DescriptionStyler.applyPartnerCustomizationLightStyle(mRepeatMessage);
         }
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 61c837a..f5dc0e6 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -21,7 +21,7 @@
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
@@ -126,8 +126,8 @@
     @Override
     protected int checkMaxEnrolled() {
         if (mFingerprintManager != null) {
-            final List<FingerprintSensorProperties> props =
-                    mFingerprintManager.getSensorProperties();
+            final List<FingerprintSensorPropertiesInternal> props =
+                    mFingerprintManager.getSensorPropertiesInternal();
             // This will need to be updated for devices with multiple fingerprint sensors
             final int max = props.get(0).maxEnrollmentsPerUser;
             final int numEnrolledFingerprints =
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 052b3f0..3782039 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -670,7 +670,9 @@
             mRemovalSidecar.startRemove(fingerPrint, mUserId);
             String name = genKey(fingerPrint.getBiometricId());
             Preference prefToRemove = findPreference(name);
-            prefToRemove.setEnabled(false);
+            if (prefToRemove != null) {
+                prefToRemove.setEnabled(false);
+            }
             updateAddPreference();
         }
 
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index a147656..1ab3a65 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -18,8 +18,10 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
@@ -49,12 +51,14 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This class adds a header with device name and status (connected/disconnected, etc.).
@@ -64,7 +68,22 @@
     private static final String TAG = "AdvancedBtHeaderCtrl";
     private static final int LOW_BATTERY_LEVEL = 15;
     private static final int CASE_LOW_BATTERY_LEVEL = 19;
-    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final String PATH = "time_remaining";
+    private static final String QUERY_PARAMETER_ADDRESS = "address";
+    private static final String QUERY_PARAMETER_BATTERY_ID = "battery_id";
+    private static final String QUERY_PARAMETER_BATTERY_LEVEL = "battery_level";
+    private static final String QUERY_PARAMETER_TIMESTAMP = "timestamp";
+    private static final String BATTERY_ESTIMATE = "battery_estimate";
+    private static final String ESTIMATE_READY = "estimate_ready";
+    private static final String DATABASE_ID = "id";
+    private static final String DATABASE_BLUETOOTH = "Bluetooth";
+    private static final long TIME_OF_HOUR = TimeUnit.SECONDS.toMillis(3600);
+    private static final long TIME_OF_MINUTE = TimeUnit.SECONDS.toMillis(60);
+    private static final int LEFT_DEVICE_ID = 1;
+    private static final int RIGHT_DEVICE_ID = 2;
+    private static final int CASE_DEVICE_ID = 3;
 
     @VisibleForTesting
     LayoutPreference mLayoutPreference;
@@ -168,19 +187,22 @@
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING,
-                    R.string.bluetooth_left_name);
+                    R.string.bluetooth_left_name,
+                    LEFT_DEVICE_ID);
 
             updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
                     BluetoothDevice.METADATA_UNTETHERED_CASE_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_CASE_CHARGING,
-                    R.string.bluetooth_middle_name);
+                    R.string.bluetooth_middle_name,
+                    CASE_DEVICE_ID);
 
             updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_CHARGING,
-                    R.string.bluetooth_right_name);
+                    R.string.bluetooth_right_name,
+                    RIGHT_DEVICE_ID);
         }
     }
 
@@ -204,7 +226,7 @@
     }
 
     private void updateSubLayout(LinearLayout linearLayout, int iconMetaKey, int batteryMetaKey,
-            int chargeMetaKey, int titleResId) {
+            int chargeMetaKey, int titleResId, int batteryId) {
         if (linearLayout == null) {
             return;
         }
@@ -217,11 +239,15 @@
 
         final int batteryLevel = BluetoothUtils.getIntMetaData(bluetoothDevice, batteryMetaKey);
         final boolean charging = BluetoothUtils.getBooleanMetaData(bluetoothDevice, chargeMetaKey);
-        if (DBG) {
+        if (DEBUG) {
             Log.d(TAG, "updateSubLayout() icon : " + iconMetaKey + ", battery : " + batteryMetaKey
                     + ", charge : " + chargeMetaKey + ", batteryLevel : " + batteryLevel
                     + ", charging : " + charging + ", iconUri : " + iconUri);
         }
+
+        if (batteryId != CASE_DEVICE_ID) {
+            showBatteryPredictionIfNecessary(linearLayout, batteryId, batteryLevel);
+        }
         if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
             linearLayout.setVisibility(View.VISIBLE);
             final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
@@ -238,6 +264,64 @@
         textView.setVisibility(View.VISIBLE);
     }
 
+    private void showBatteryPredictionIfNecessary(LinearLayout linearLayout, int batteryId,
+            int batteryLevel) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            final Uri contentUri = new Uri.Builder()
+                    .scheme(ContentResolver.SCHEME_CONTENT)
+                    .authority(mContext.getString(R.string.config_battery_prediction_authority))
+                    .appendPath(PATH)
+                    .appendPath(DATABASE_ID)
+                    .appendPath(DATABASE_BLUETOOTH)
+                    .appendQueryParameter(QUERY_PARAMETER_ADDRESS, mCachedDevice.getAddress())
+                    .appendQueryParameter(QUERY_PARAMETER_BATTERY_ID, String.valueOf(batteryId))
+                    .appendQueryParameter(QUERY_PARAMETER_BATTERY_LEVEL,
+                            String.valueOf(batteryLevel))
+                    .appendQueryParameter(QUERY_PARAMETER_TIMESTAMP,
+                            String.valueOf(System.currentTimeMillis()))
+                    .build();
+
+            final String[] columns = new String[] {BATTERY_ESTIMATE, ESTIMATE_READY};
+            final Cursor cursor =
+                    mContext.getContentResolver().query(contentUri, columns, null, null, null);
+            if (cursor == null) {
+                Log.w(TAG, "showBatteryPredictionIfNecessary() cursor is null!");
+                return;
+            }
+            try {
+                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                    final int estimateReady =
+                            cursor.getInt(cursor.getColumnIndex(ESTIMATE_READY));
+                    final long batteryEstimate =
+                            cursor.getLong(cursor.getColumnIndex(BATTERY_ESTIMATE));
+                    if (DEBUG) {
+                        Log.d(TAG, "showBatteryTimeIfNecessary() batteryId : " + batteryId
+                                + ", ESTIMATE_READY : " + estimateReady
+                                + ", BATTERY_ESTIMATE : " + batteryEstimate);
+                    }
+                    showBatteryPredictionIfNecessary(estimateReady, batteryEstimate,
+                            linearLayout);
+                }
+            } finally {
+                cursor.close();
+            }
+        });
+    }
+
+    @VisibleForTesting
+    void showBatteryPredictionIfNecessary(int estimateReady, long batteryEstimate,
+            LinearLayout linearLayout) {
+        ThreadUtils.postOnMainThread(() -> {
+            final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+            if (estimateReady == 1) {
+                textView.setVisibility(View.VISIBLE);
+                textView.setText(StringUtil.formatElapsedTime(mContext, batteryEstimate, false));
+            } else {
+                textView.setVisibility(View.GONE);
+            }
+        });
+    }
+
     private void showBatteryIcon(LinearLayout linearLayout, int level, boolean charging,
             int batteryMetaKey) {
         final int lowBatteryLevel =
@@ -279,7 +363,7 @@
         final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
         final String iconUri = BluetoothUtils.getStringMetaData(bluetoothDevice,
                 BluetoothDevice.METADATA_MAIN_ICON);
-        if (DBG) {
+        if (DEBUG) {
             Log.d(TAG, "updateDisconnectLayout() iconUri : " + iconUri);
         }
         if (iconUri != null) {
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 556f76d..4773aca 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -50,6 +50,7 @@
     private final boolean mTetheringRestrictedBySystem;
     private final boolean mMidiSupported;
     private final boolean mTetheringSupported;
+    private final boolean mIsAdminUser;
 
     private UsbManager mUsbManager;
 
@@ -70,6 +71,7 @@
         mFileTransferRestrictedBySystem = isUsbFileTransferRestrictedBySystem(userManager);
         mTetheringRestricted = isUsbTetheringRestricted(userManager);
         mTetheringRestrictedBySystem = isUsbTetheringRestrictedBySystem(userManager);
+        mIsAdminUser = userManager.isAdminUser();
 
         mMidiSupported = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
         ConnectivityManager cm =
@@ -100,7 +102,8 @@
                 || (!mTetheringSupported && (functions & UsbManager.FUNCTION_RNDIS) != 0)) {
             return false;
         }
-        return !(areFunctionDisallowed(functions) || areFunctionsDisallowedBySystem(functions));
+        return !(areFunctionDisallowed(functions) || areFunctionsDisallowedBySystem(functions)
+                || areFunctionsDisallowedByNonAdminUser(functions));
     }
 
     public int getPowerRole() {
@@ -207,6 +210,11 @@
                 || (mTetheringRestrictedBySystem && ((functions & UsbManager.FUNCTION_RNDIS) != 0));
     }
 
+    @VisibleForTesting
+    boolean areFunctionsDisallowedByNonAdminUser(long functions) {
+        return !mIsAdminUser && (functions & UsbManager.FUNCTION_RNDIS) != 0;
+    }
+
     private void updatePorts() {
         mPort = null;
         mPortStatus = null;
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index ded1294..b91bb79 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -115,7 +115,8 @@
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
         final long previousFunction = mUsbBackend.getCurrentFunctions();
-        if (function != previousFunction && !Utils.isMonkeyRunning()) {
+        if (function != previousFunction && !Utils.isMonkeyRunning()
+                && !shouldIgnoreClickEvent(function, previousFunction)) {
             mPreviousFunction = previousFunction;
 
             //Update the UI in advance to make it looks smooth
@@ -138,6 +139,11 @@
         }
     }
 
+    private boolean shouldIgnoreClickEvent(long function, long previousFunction) {
+        return previousFunction == UsbManager.FUNCTION_ACCESSORY
+                && function == UsbManager.FUNCTION_MTP;
+    }
+
     @Override
     public boolean isAvailable() {
         return !Utils.isMonkeyRunning();
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 68fa1d3..d160dc5 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -41,11 +41,14 @@
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.dashboard.CategoryManager;
+import com.android.settingslib.drawer.Tile;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class SettingsBaseActivity extends FragmentActivity {
 
@@ -59,6 +62,7 @@
 
     private final PackageReceiver mPackageReceiver = new PackageReceiver();
     private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
+    private int mCategoriesUpdateTaskCount;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -147,10 +151,10 @@
         ((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
     }
 
-    private void onCategoriesChanged() {
+    private void onCategoriesChanged(Set<String> categories) {
         final int N = mCategoryListeners.size();
         for (int i = 0; i < N; i++) {
-            mCategoryListeners.get(i).onCategoriesChanged();
+            mCategoryListeners.get(i).onCategoriesChanged(categories);
         }
     }
 
@@ -194,38 +198,100 @@
      * Updates dashboard categories. Only necessary to call this after setTileEnabled
      */
     public void updateCategories() {
-        new CategoriesUpdateTask().execute();
+        updateCategories(false /* fromBroadcast */);
+    }
+
+    private void updateCategories(boolean fromBroadcast) {
+        // Only allow at most 2 tasks existing at the same time since when the first one is
+        // executing, there may be new data from the second update request.
+        // Ignore the third update request because the second task is still waiting for the first
+        // task to complete in a serial thread, which will get the latest data.
+        if (mCategoriesUpdateTaskCount < 2) {
+            new CategoriesUpdateTask().execute(fromBroadcast);
+        }
     }
 
     public interface CategoryListener {
-        void onCategoriesChanged();
+        /**
+         * @param categories the changed categories that have to be refreshed, or null to force
+         * refreshing all.
+         */
+        void onCategoriesChanged(@Nullable Set<String> categories);
     }
 
-    private class CategoriesUpdateTask extends AsyncTask<Void, Void, Void> {
+    private class CategoriesUpdateTask extends AsyncTask<Boolean, Void, Set<String>> {
 
+        private final Context mContext;
         private final CategoryManager mCategoryManager;
+        private Map<ComponentName, Tile> mPreviousTileMap;
 
         public CategoriesUpdateTask() {
-            mCategoryManager = CategoryManager.get(SettingsBaseActivity.this);
+            mCategoriesUpdateTaskCount++;
+            mContext = SettingsBaseActivity.this;
+            mCategoryManager = CategoryManager.get(mContext);
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
-            mCategoryManager.reloadAllCategories(SettingsBaseActivity.this);
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void result) {
+        protected Set<String> doInBackground(Boolean... params) {
+            mPreviousTileMap = mCategoryManager.getTileByComponentMap();
+            mCategoryManager.reloadAllCategories(mContext);
             mCategoryManager.updateCategoryFromDenylist(sTileDenylist);
-            onCategoriesChanged();
+            return getChangedCategories(params[0]);
+        }
+
+        @Override
+        protected void onPostExecute(Set<String> categories) {
+            if (categories == null || !categories.isEmpty()) {
+                onCategoriesChanged(categories);
+            }
+            mCategoriesUpdateTaskCount--;
+        }
+
+        // Return the changed categories that have to be refreshed, or null to force refreshing all.
+        private Set<String> getChangedCategories(boolean fromBroadcast) {
+            if (!fromBroadcast) {
+                // Always refresh for non-broadcast case.
+                return null;
+            }
+
+            final Set<String> changedCategories = new ArraySet<>();
+            final Map<ComponentName, Tile> currentTileMap =
+                    mCategoryManager.getTileByComponentMap();
+            currentTileMap.forEach((component, currentTile) -> {
+                final Tile previousTile = mPreviousTileMap.get(component);
+                // Check if the tile is newly added.
+                if (previousTile == null) {
+                    Log.i(TAG, "Tile added: " + component.flattenToShortString());
+                    changedCategories.add(currentTile.getCategory());
+                    return;
+                }
+
+                // Check if the title or summary has changed.
+                if (!TextUtils.equals(currentTile.getTitle(mContext),
+                        previousTile.getTitle(mContext))
+                        || !TextUtils.equals(currentTile.getSummary(mContext),
+                        previousTile.getSummary(mContext))) {
+                    Log.i(TAG, "Tile changed: " + component.flattenToShortString());
+                    changedCategories.add(currentTile.getCategory());
+                }
+            });
+
+            // Check if any previous tile is removed.
+            final Set<ComponentName> removal = new ArraySet(mPreviousTileMap.keySet());
+            removal.removeAll(currentTileMap.keySet());
+            removal.forEach(component -> {
+                Log.i(TAG, "Tile removed: " + component.flattenToShortString());
+                changedCategories.add(mPreviousTileMap.get(component).getCategory());
+            });
+
+            return changedCategories;
         }
     }
 
     private class PackageReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateCategories();
+            updateCategories(true /* fromBroadcast */);
         }
     }
 }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 4a5d71a..8934034 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -108,11 +108,11 @@
 import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
-import com.android.settings.network.ApnEditor;
-import com.android.settings.network.ApnSettings;
 import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.network.apn.ApnEditor;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
diff --git a/src/com/android/settings/dashboard/CategoryManager.java b/src/com/android/settings/dashboard/CategoryManager.java
index 51c485a..2a82abe 100644
--- a/src/com/android/settings/dashboard/CategoryManager.java
+++ b/src/com/android/settings/dashboard/CategoryManager.java
@@ -41,6 +41,7 @@
 public class CategoryManager {
 
     private static final String TAG = "CategoryManager";
+    private static final boolean DEBUG = false;
 
     private static CategoryManager sInstance;
     private final InterestingConfigChanges mInterestingConfigChanges;
@@ -92,6 +93,7 @@
     public synchronized void updateCategoryFromDenylist(Set<ComponentName> tileDenylist) {
         if (mCategories == null) {
             Log.w(TAG, "Category is null, skipping denylist update");
+            return;
         }
         for (int i = 0; i < mCategories.size(); i++) {
             DashboardCategory category = mCategories.get(i);
@@ -104,6 +106,31 @@
         }
     }
 
+    /** Return the current tile map */
+    public synchronized Map<ComponentName, Tile> getTileByComponentMap() {
+        final Map<ComponentName, Tile> result = new ArrayMap<>();
+        if (mCategories == null) {
+            Log.w(TAG, "Category is null, no tiles");
+            return result;
+        }
+        mCategories.forEach(category -> {
+            for (int i = 0; i < category.getTilesCount(); i++) {
+                final Tile tile = category.getTile(i);
+                result.put(tile.getIntent().getComponent(), tile);
+            }
+        });
+        return result;
+    }
+
+    private void logTiles(Context context) {
+        if (DEBUG) {
+            getTileByComponentMap().forEach((component, tile) -> {
+                Log.d(TAG, "Tile: " + tile.getCategory().replace("com.android.settings.", "")
+                        + ": " + tile.getTitle(context) + ", " + component.flattenToShortString());
+            });
+        }
+    }
+
     private synchronized void tryInitCategories(Context context) {
         // Keep cached tiles by default. The cache is only invalidated when InterestingConfigChange
         // happens.
@@ -112,6 +139,7 @@
 
     private synchronized void tryInitCategories(Context context, boolean forceClearCache) {
         if (mCategories == null) {
+            final boolean firstLoading = mCategoryByKeyMap.isEmpty();
             if (forceClearCache) {
                 mTileByComponentCache.clear();
             }
@@ -123,6 +151,9 @@
             backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
             sortCategories(context, mCategoryByKeyMap);
             filterDuplicateTiles(mCategoryByKeyMap);
+            if (firstLoading) {
+                logTiles(context);
+            }
         }
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 40d26f7..82c3668 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -248,7 +248,9 @@
             final Map<String, IContentProvider> providerMap = new ArrayMap<>();
             final String titleFromUri = TileUtils.getTextFromUri(
                     mContext, uri, providerMap, META_DATA_PREFERENCE_TITLE);
-            ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+            if (!TextUtils.equals(titleFromUri, preference.getTitle())) {
+                ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+            }
         });
     }
 
@@ -277,7 +279,9 @@
             final Map<String, IContentProvider> providerMap = new ArrayMap<>();
             final String summaryFromUri = TileUtils.getTextFromUri(
                     mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);
-            ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
+            if (!TextUtils.equals(summaryFromUri, preference.getSummary())) {
+                ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
+            }
         });
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index a273d6c..e0c9820 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -160,13 +161,21 @@
     }
 
     @Override
-    public void onCategoriesChanged() {
-        final DashboardCategory category =
-                mDashboardFeatureProvider.getTilesForCategory(getCategoryKey());
-        if (category == null) {
+    public void onCategoriesChanged(Set<String> categories) {
+        final String categoryKey = getCategoryKey();
+        final DashboardCategory dashboardCategory =
+                mDashboardFeatureProvider.getTilesForCategory(categoryKey);
+        if (dashboardCategory == null) {
             return;
         }
-        refreshDashboardTiles(getLogTag());
+
+        if (categories == null) {
+            // force refreshing
+            refreshDashboardTiles(getLogTag());
+        } else if (categories.contains(categoryKey)) {
+            Log.i(TAG, "refresh tiles for " + categoryKey);
+            refreshDashboardTiles(getLogTag());
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index a3d0c46..acd6bab 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development;
 
+import static android.service.quicksettings.TileService.ACTION_QS_TILE_PREFERENCES;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothA2dp;
@@ -23,12 +25,14 @@
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,6 +45,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.development.autofill.AutofillLoggingLevelPreferenceController;
 import com.android.settings.development.autofill.AutofillResetOptionsPreferenceController;
@@ -52,6 +57,7 @@
 import com.android.settings.development.bluetooth.BluetoothHDAudioPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;
+import com.android.settings.development.qstile.DevelopmentTiles;
 import com.android.settings.development.storage.SharedDataPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
@@ -199,11 +205,42 @@
         // Restore UI state based on whether developer options is enabled
         if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext())) {
             enableDeveloperOptions();
+            handleQsTileLongPressActionIfAny();
         } else {
             disableDeveloperOptions();
         }
     }
 
+    /**
+     * Long-pressing a developer options quick settings tile will by default (see
+     * QS_TILE_PREFERENCES in the manifest) take you to the developer options page.
+     * Some tiles may want to go into their own page within the developer options.
+     */
+    private void handleQsTileLongPressActionIfAny() {
+        Intent intent = getActivity().getIntent();
+        if (intent == null || !TextUtils.equals(ACTION_QS_TILE_PREFERENCES, intent.getAction())) {
+            return;
+        }
+
+        Log.d(TAG, "Developer options started from qstile long-press");
+        final ComponentName componentName = (ComponentName) intent.getParcelableExtra(
+                Intent.EXTRA_COMPONENT_NAME);
+        if (componentName == null) {
+            return;
+        }
+
+        if (DevelopmentTiles.WirelessDebugging.class.getName().equals(
+                componentName.getClassName()) && getDevelopmentOptionsController(
+                    WirelessDebuggingPreferenceController.class).isAvailable()) {
+            Log.d(TAG, "Long press from wireless debugging qstile");
+            new SubSettingLauncher(getContext())
+                    .setDestination(WirelessDebuggingFragment.class.getName())
+                    .setSourceMetricsCategory(SettingsEnums.SETTINGS_ADB_WIRELESS)
+                    .launch();
+        }
+        // Add other qstiles here
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index 8a7f4bd..47a46f2 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -22,12 +22,15 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -35,6 +38,9 @@
 import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.Arrays;
+import java.util.List;
+
 @SearchIndexable(forTarget = MOBILE)
 public class TopLevelSettings extends DashboardFragment implements
         PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
@@ -50,6 +56,9 @@
 
     @Override
     protected int getPreferenceScreenResId() {
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            return R.xml.top_level_settings_grouped;
+        }
         return R.xml.top_level_settings;
     }
 
@@ -100,7 +109,16 @@
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.top_level_settings) {
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
+                            ? R.xml.top_level_settings_grouped : R.xml.top_level_settings;
+                    return Arrays.asList(sir);
+                }
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index 1288cf5..a5dec14 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -247,6 +247,10 @@
 
     }
 
+    boolean shouldDisableMediaOutput(String packageName) {
+        return mLocalMediaManager.shouldDisableMediaOutput(packageName);
+    }
+
     private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 305c7df..40ee05b 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -16,18 +16,15 @@
 
 package com.android.settings.media;
 
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
 
 import android.annotation.ColorInt;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.media.session.MediaController;
 import android.net.Uri;
-import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
@@ -63,14 +60,9 @@
                 com.android.internal.R.drawable.ic_settings_bluetooth);
         final CharSequence title = mContext.getString(R.string.media_output_label_title,
                 Utils.getApplicationLabel(mContext, getWorker().getPackageName()));
-        final int requestCode = TextUtils.isEmpty(getWorker().getPackageName())
-                ? 0
-                : getWorker().getPackageName().hashCode();
-        final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
-                requestCode,
-                getMediaOutputSliceIntent(), FLAG_UPDATE_CURRENT);
-        final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                primaryActionIntent, icon, ListBuilder.ICON_IMAGE, title);
+        final SliceAction primarySliceAction = SliceAction.create(
+                getBroadcastIntent(mContext), icon, ListBuilder.ICON_IMAGE, title);
+
         @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
         // To set an empty icon to indent the row
         final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
@@ -83,22 +75,6 @@
         return listBuilder.build();
     }
 
-    @VisibleForTesting
-    Intent getMediaOutputSliceIntent() {
-        final MediaController mediaController = getWorker().getActiveLocalMediaController();
-        final Intent intent = new Intent()
-                .setPackage(Utils.SETTINGS_PACKAGE_NAME)
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (mediaController != null) {
-            intent.putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
-                    mediaController.getSessionToken());
-            intent.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
-                    mediaController.getPackageName());
-        }
-        return intent;
-    }
-
     private IconCompat createEmptyIcon() {
         final Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
         return IconCompat.createWithBitmap(bitmap);
@@ -141,4 +117,26 @@
                 && getWorker().getMediaDevices().size() > 0
                 && getWorker().getActiveLocalMediaController() != null;
     }
+
+    @Override
+    public void onNotifyChange(Intent intent) {
+        final MediaController mediaController = getWorker().getActiveLocalMediaController();
+
+        if (mediaController == null) {
+            Log.d(TAG, "No active local media controller");
+            return;
+        }
+        // Launch media output dialog
+        mContext.sendBroadcast(new Intent()
+                .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
+                        mediaController.getSessionToken())
+                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                        mediaController.getPackageName()));
+        // Dismiss volume panel
+        mContext.sendBroadcast(new Intent()
+                .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)
+                .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));
+    }
 }
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index c412239..debc0ec 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -17,6 +17,7 @@
 package com.android.settings.media;
 
 import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
+import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
 
 import static com.android.settings.slices.CustomSliceRegistry.REMOTE_MEDIA_SLICE_URI;
 
@@ -24,11 +25,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.net.Uri;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.builders.ListBuilder;
@@ -54,11 +59,17 @@
 
     private static final String TAG = "RemoteMediaSlice";
     private static final String MEDIA_ID = "media_id";
+    private static final String ACTION_LAUNCH_DIALOG = "action_launch_dialog";
+    private static final String SESSION_INFO = "RoutingSessionInfo";
+    private static final String CUSTOMIZED_ACTION = "customized_action";
 
     private final Context mContext;
 
     private MediaDeviceUpdateWorker mWorker;
 
+    @VisibleForTesting
+    MediaRouter2Manager mRouterManager;
+
     public RemoteMediaSlice(Context context) {
         mContext = context;
     }
@@ -69,6 +80,20 @@
         final String id = intent.getStringExtra(MEDIA_ID);
         if (!TextUtils.isEmpty(id)) {
             getWorker().adjustSessionVolume(id, newPosition);
+            return;
+        }
+        if (TextUtils.equals(ACTION_LAUNCH_DIALOG, intent.getStringExtra(CUSTOMIZED_ACTION))) {
+            // Launch Media Output Dialog
+            final RoutingSessionInfo info = intent.getParcelableExtra(SESSION_INFO);
+            mContext.sendBroadcast(new Intent()
+                    .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                            info.getClientPackageName()));
+            // Dismiss volume panel
+            mContext.sendBroadcast(new Intent()
+                    .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)
+                    .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));
         }
     }
 
@@ -80,6 +105,9 @@
             Log.e(TAG, "Unable to get the slice worker.");
             return listBuilder.build();
         }
+        if (mRouterManager == null) {
+            mRouterManager = MediaRouter2Manager.getInstance(mContext);
+        }
         // Only displaying remote devices
         final List<RoutingSessionInfo> infos = getWorker().getActiveRemoteMediaDevice();
         if (infos.isEmpty()) {
@@ -98,8 +126,10 @@
                         + maxVolume);
                 continue;
             }
+            final CharSequence appName = Utils.getApplicationLabel(
+                    mContext, info.getClientPackageName());
             final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
-                    Utils.getApplicationLabel(mContext, info.getClientPackageName()));
+                    appName);
             listBuilder.addInputRange(new InputRangeBuilder()
                     .setTitleItem(icon, ListBuilder.ICON_IMAGE)
                     .setTitle(castVolume)
@@ -107,11 +137,20 @@
                     .setPrimaryAction(getSoundSettingAction(castVolume, icon, info.getId()))
                     .setMax(maxVolume)
                     .setValue(info.getVolume()));
+
+            final boolean isMediaOutputDisabled =
+                    getWorker().shouldDisableMediaOutput(info.getClientPackageName());
+            final SpannableString spannableTitle = new SpannableString(
+                    TextUtils.isEmpty(appName) ? "" : appName);
+            spannableTitle.setSpan(new ForegroundColorSpan(
+                            Utils.getColorAttrDefaultColor(
+                                    mContext, android.R.attr.textColorSecondary)), 0,
+                    spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE);
             listBuilder.addRow(new ListBuilder.RowBuilder()
-                    .setTitle(outputTitle)
+                    .setTitle(isMediaOutputDisabled ? spannableTitle : outputTitle)
                     .setSubtitle(info.getName())
                     .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
-                    .setPrimaryAction(getMediaOutputSliceAction(info.getClientPackageName())));
+                    .setPrimaryAction(getMediaOutputDialogAction(info, isMediaOutputDisabled)));
         }
         return listBuilder.build();
     }
@@ -144,20 +183,22 @@
         return primarySliceAction;
     }
 
-    private SliceAction getMediaOutputSliceAction(String packageName) {
-        final Intent intent = new Intent()
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName);
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_volume_remote);
-        final int requestCode = TextUtils.isEmpty(packageName) ? 0 : packageName.hashCode();
-        final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
-                requestCode, intent, 0 /* flags */);
+    private SliceAction getMediaOutputDialogAction(RoutingSessionInfo info,
+            boolean isMediaOutputDisabled) {
+        final Intent intent = new Intent(getUri().toString())
+                .setData(getUri())
+                .setClass(mContext, SliceBroadcastReceiver.class)
+                .putExtra(CUSTOMIZED_ACTION, isMediaOutputDisabled ? "" : ACTION_LAUNCH_DIALOG)
+                .putExtra(SESSION_INFO, info)
+                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
+                info.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                primaryActionIntent, icon, ListBuilder.ICON_IMAGE,
+                primaryBroadcastIntent,
+                IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote),
+                ListBuilder.ICON_IMAGE,
                 mContext.getString(R.string.media_output_label_title,
-                        Utils.getApplicationLabel(mContext, packageName)));
+                        Utils.getApplicationLabel(mContext, info.getClientPackageName())));
         return primarySliceAction;
     }
 
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 5612d2e..b968438 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -18,6 +18,8 @@
 import static android.os.UserHandle.myUserId;
 import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
 
+import static androidx.lifecycle.Lifecycle.Event;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +31,8 @@
 import android.telephony.TelephonyManager;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -39,12 +43,9 @@
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
-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 MobileNetworkPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
+        implements PreferenceControllerMixin, LifecycleObserver {
 
     @VisibleForTesting
     static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
@@ -96,7 +97,7 @@
         return KEY_MOBILE_NETWORK_SETTINGS;
     }
 
-    @Override
+    @OnLifecycleEvent(Event.ON_START)
     public void onStart() {
         if (isAvailable()) {
             if (mPhoneStateListener == null) {
@@ -115,7 +116,7 @@
         }
     }
 
-    @Override
+    @OnLifecycleEvent(Event.ON_STOP)
     public void onStop() {
         if (mPhoneStateListener != null) {
             mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index e61cc36..e2c8997 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -21,6 +21,7 @@
 
 import static com.android.internal.util.CollectionUtils.emptyIfNull;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.os.ParcelUuid;
 import android.telephony.SubscriptionInfo;
@@ -30,10 +31,15 @@
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.network.telephony.DeleteEuiccSubscriptionDialogActivity;
+import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class SubscriptionUtil {
     private static final String TAG = "SubscriptionUtil";
@@ -278,6 +284,38 @@
         }
     }
 
+    /** Starts a dialog activity to handle SIM enabling/disabling. */
+    public static void startToggleSubscriptionDialogActivity(
+            Context context, int subId, boolean enable) {
+        context.startActivity(ToggleSubscriptionDialogActivity.getIntent(context, subId, enable));
+    }
+
+    /** Starts a dialog activity to handle eSIM deletion. */
+    public static void startDeleteEuiccSubscriptionDialogActivity(Context context, int subId) {
+        context.startActivity(DeleteEuiccSubscriptionDialogActivity.getIntent(context, subId));
+    }
+
+    /**
+     * Finds and returns a subscription with a specific subscription ID.
+     * @param subscriptionManager The ProxySubscriptionManager for accessing subscription
+     *                            information
+     * @param subId The id of subscription to be returned
+     * @return the {@code SubscriptionInfo} whose ID is {@code subId}. It returns null if the
+     * {@code subId} is {@code SubscriptionManager.INVALID_SUBSCRIPTION_ID} or no such
+     * {@code SubscriptionInfo} is found.
+     */
+    @Nullable
+    public static SubscriptionInfo getSubById(SubscriptionManager subscriptionManager, int subId) {
+        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return null;
+        }
+        return subscriptionManager
+                .getAllSubscriptionInfoList()
+                .stream()
+                .filter(subInfo -> subInfo.getSubscriptionId() == subId)
+                .findFirst()
+                .get();
+    }
 
     /**
      * Whether a subscription is visible to API caller. If it's a bundled opportunistic
@@ -302,4 +340,33 @@
                 || subscriptionManager.canManageSubscription(info);
         return hasCarrierPrivilegePermission;
     }
+
+    /**
+     * Finds all the available subscriptions having the same group uuid as {@code subscriptionInfo}.
+     * @param subscriptionManager The SubscriptionManager for accessing subscription information
+     * @param subId The id of subscription
+     * @return a list of {@code SubscriptionInfo} which have the same group UUID.
+     */
+    public static List<SubscriptionInfo> findAllSubscriptionsInGroup(
+            SubscriptionManager subscriptionManager, int subId) {
+
+        SubscriptionInfo subscription = getSubById(subscriptionManager, subId);
+        if (subscription == null) {
+            return Collections.emptyList();
+        }
+        ParcelUuid groupUuid = subscription.getGroupUuid();
+        List<SubscriptionInfo> availableSubscriptions =
+                subscriptionManager.getAvailableSubscriptionInfoList();
+
+        if (availableSubscriptions == null
+                || availableSubscriptions.isEmpty()
+                || groupUuid == null) {
+            return Collections.singletonList(subscription);
+        }
+
+        return availableSubscriptions
+                .stream()
+                .filter(sub -> sub.isEmbedded() && groupUuid.equals(sub.getGroupUuid()))
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
new file mode 100644
index 0000000..2eaa0ec
--- /dev/null
+++ b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.app.PendingIntent;
+
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.telephony.EuiccOperationSidecar;
+
+/** A headless fragment encapsulating long-running eSIM enabling/disabling operations. */
+public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
+    private static final String TAG = "SwitchToEuiccSubscriptionSidecar";
+    private static final String ACTION_SWITCH_TO_SUBSCRIPTION =
+            "com.android.settings.network.switchToSubscription";
+
+    private PendingIntent mCallbackIntent;
+
+    /** Returns a SwitchToEuiccSubscriptionSidecar sidecar instance. */
+    public static SwitchToEuiccSubscriptionSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(
+                fm, TAG, SwitchToEuiccSubscriptionSidecar.class, null /* args */);
+    }
+
+    @Override
+    public String getReceiverAction() {
+        return ACTION_SWITCH_TO_SUBSCRIPTION;
+    }
+
+    /** Returns the pendingIntent of the eSIM operations. */
+    public PendingIntent getCallbackIntent() {
+        return mCallbackIntent;
+    }
+
+    /** Starts calling EuiccManager#switchToSubscription to enable/disable the eSIM profile. */
+    public void run(int subscriptionId) {
+        setState(State.RUNNING, Substate.UNUSED);
+        mCallbackIntent = createCallbackIntent();
+        mEuiccManager.switchToSubscription(subscriptionId, mCallbackIntent);
+    }
+}
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
similarity index 97%
rename from src/com/android/settings/network/ApnEditor.java
rename to src/com/android/settings/network/apn/ApnEditor.java
index a852fd6..8f6d64d 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network;
+package com.android.settings.network.apn;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -53,6 +53,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.ProxySubscriptionManager;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Arrays;
@@ -61,20 +62,21 @@
 import java.util.Objects;
 import java.util.Set;
 
+/** Use to edit apn settings. */
 public class ApnEditor extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, OnKeyListener {
 
-    private final static String TAG = ApnEditor.class.getSimpleName();
-    private final static boolean VDBG = false;   // STOPSHIP if true
+    private static final String TAG = ApnEditor.class.getSimpleName();
+    private static final boolean VDBG = false;   // STOPSHIP if true
 
-    private final static String KEY_AUTH_TYPE = "auth_type";
+    private static final String KEY_AUTH_TYPE = "auth_type";
     private static final String KEY_APN_TYPE = "apn_type";
-    private final static String KEY_PROTOCOL = "apn_protocol";
-    private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
-    private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
-    private final static String KEY_BEARER_MULTI = "bearer_multi";
-    private final static String KEY_MVNO_TYPE = "mvno_type";
-    private final static String KEY_PASSWORD = "apn_password";
+    private static final String KEY_PROTOCOL = "apn_protocol";
+    private static final String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
+    private static final String KEY_CARRIER_ENABLED = "carrier_enabled";
+    private static final String KEY_BEARER_MULTI = "bearer_multi";
+    private static final String KEY_MVNO_TYPE = "mvno_type";
+    private static final String KEY_PASSWORD = "apn_password";
 
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -213,7 +215,7 @@
             Telephony.Carriers.MCC, // 9
             Telephony.Carriers.MNC, // 10
             Telephony.Carriers.NUMERIC, // 11
-            Telephony.Carriers.MMSPROXY,// 12
+            Telephony.Carriers.MMSPROXY, // 12
             Telephony.Carriers.MMSPORT, // 13
             Telephony.Carriers.AUTH_TYPE, // 14
             Telephony.Carriers.TYPE, // 15
@@ -583,7 +585,7 @@
                 }
             }
 
-            if (mBearerInitialVal != 0 && bearers.contains("" + mBearerInitialVal) == false) {
+            if (mBearerInitialVal != 0 && !bearers.contains("" + mBearerInitialVal)) {
                 // add mBearerInitialVal to bearers
                 bearers.add("" + mBearerInitialVal);
             }
@@ -699,7 +701,7 @@
                             && Arrays.asList(mReadOnlyApnFields)
                             .contains(Telephony.Carriers.MVNO_MATCH_DATA));
             mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
-            if (newValue != null && newValue.equals(oldValue) == false) {
+            if (newValue != null && !newValue.equals(oldValue)) {
                 if (values[mvnoIndex].equals("SPN")) {
                     TelephonyManager telephonyManager = (TelephonyManager)
                             getContext().getSystemService(TelephonyManager.class);
@@ -739,7 +741,9 @@
             }
         }
     }
-
+    /**
+     * Callback when preference status changed.
+     */
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
         if (KEY_AUTH_TYPE.equals(key)) {
@@ -1342,8 +1346,13 @@
         }
     }
 
+    /**
+     * Dialog of error message.
+     */
     public static class ErrorDialog extends InstrumentedDialogFragment {
-
+        /**
+         * Show error dialog.
+         */
         public static void showError(ApnEditor editor) {
             final ErrorDialog dialog = new ErrorDialog();
             dialog.setTargetFragment(editor, 0);
diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/apn/ApnPreference.java
similarity index 82%
rename from src/com/android/settings/network/ApnPreference.java
rename to src/com/android/settings/network/apn/ApnPreference.java
index 63e2838..f277db0 100755
--- a/src/com/android/settings/network/ApnPreference.java
+++ b/src/com/android/settings/network/apn/ApnPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network;
+package com.android.settings.network.apn;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -40,7 +40,7 @@
  */
 public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener,
         View.OnClickListener {
-    final static String TAG = "ApnPreference";
+    private static final  String TAG = "ApnPreference";
 
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
@@ -65,8 +65,8 @@
         this(context, null);
     }
 
-    private static String mSelectedKey = null;
-    private static CompoundButton mCurrentChecked = null;
+    private static String sSelectedKey = null;
+    private static CompoundButton sCurrentChecked = null;
     private boolean mProtectFromCheckedChange = false;
     private boolean mSelectable = true;
     private boolean mHideDetails = false;
@@ -84,10 +84,10 @@
             if (mSelectable) {
                 rb.setOnCheckedChangeListener(this);
 
-                final boolean isChecked = getKey().equals(mSelectedKey);
+                final boolean isChecked = getKey().equals(sSelectedKey);
                 if (isChecked) {
-                    mCurrentChecked = rb;
-                    mSelectedKey = getKey();
+                    sCurrentChecked = rb;
+                    sSelectedKey = getKey();
                 }
 
                 mProtectFromCheckedChange = true;
@@ -100,14 +100,23 @@
         }
     }
 
+    /**
+     * Return the preference is checked or not.
+     */
     public boolean isChecked() {
-        return getKey().equals(mSelectedKey);
+        return getKey().equals(sSelectedKey);
     }
 
+    /**
+     * Set preference checked.
+     */
     public void setChecked() {
-        mSelectedKey = getKey();
+        sSelectedKey = getKey();
     }
 
+    /**
+     * Change the preference status.
+     */
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         Log.i(TAG, "ID: " + getKey() + " :" + isChecked);
         if (mProtectFromCheckedChange) {
@@ -115,15 +124,15 @@
         }
 
         if (isChecked) {
-            if (mCurrentChecked != null) {
-                mCurrentChecked.setChecked(false);
+            if (sCurrentChecked != null) {
+                sCurrentChecked.setChecked(false);
             }
-            mCurrentChecked = buttonView;
-            mSelectedKey = getKey();
-            callChangeListener(mSelectedKey);
+            sCurrentChecked = buttonView;
+            sSelectedKey = getKey();
+            callChangeListener(sSelectedKey);
         } else {
-            mCurrentChecked = null;
-            mSelectedKey = null;
+            sCurrentChecked = null;
+            sSelectedKey = null;
         }
     }
 
@@ -161,6 +170,9 @@
         mSubId = subId;
     }
 
+    /**
+     * Hide details
+     */
     public void setHideDetails() {
         mHideDetails = true;
     }
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
similarity index 96%
rename from src/com/android/settings/network/ApnSettings.java
rename to src/com/android/settings/network/apn/ApnSettings.java
index f7617fc..f5bb1be 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network;
+package com.android.settings.network.apn;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -56,19 +56,21 @@
 
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
 
+/** Handle each different apn setting. */
 public class ApnSettings extends RestrictedSettingsFragment
         implements Preference.OnPreferenceChangeListener {
     static final String TAG = "ApnSettings";
 
     public static final String EXTRA_POSITION = "position";
     public static final String RESTORE_CARRIERS_URI =
-        "content://telephony/carriers/restore";
+            "content://telephony/carriers/restore";
     public static final String PREFERRED_APN_URI =
-        "content://telephony/carriers/preferapn";
+            "content://telephony/carriers/preferapn";
 
     public static final String APN_ID = "apn_id";
     public static final String SUB_ID = "sub_id";
@@ -104,7 +106,7 @@
     private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
     private static final Uri PREFERAPN_URI = Uri.parse(PREFERRED_APN_URI);
 
-    private static boolean mRestoreDefaultApnMode;
+    private boolean mRestoreDefaultApnMode;
 
     private UserManager mUserManager;
     private TelephonyManager mTelephonyManager;
@@ -385,13 +387,12 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        case MENU_NEW:
-            addNewApn();
-            return true;
-
-        case MENU_RESTORE:
-            restoreDefaultApn();
-            return true;
+            case MENU_NEW:
+                addNewApn();
+                return true;
+            case MENU_RESTORE:
+                restoreDefaultApn();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -451,8 +452,7 @@
             mRestoreApnUiHandler = new RestoreApnUiHandler();
         }
 
-        if (mRestoreApnProcessHandler == null ||
-            mRestoreDefaultApnThread == null) {
+        if (mRestoreApnProcessHandler == null || mRestoreDefaultApnThread == null) {
             mRestoreDefaultApnThread = new HandlerThread(
                     "Restore default APN Handler: Process Thread");
             mRestoreDefaultApnThread.start();
@@ -503,7 +503,7 @@
     private class RestoreApnProcessHandler extends Handler {
         private Handler mRestoreApnUiHandler;
 
-        public RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
+        RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
             super(looper);
             this.mRestoreApnUiHandler = restoreApnUiHandler;
         }
diff --git a/src/com/android/settings/network/telephony/AlertDialogFragment.java b/src/com/android/settings/network/telephony/AlertDialogFragment.java
new file mode 100644
index 0000000..5940789
--- /dev/null
+++ b/src/com/android/settings/network/telephony/AlertDialogFragment.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+/** Fragment to show an alert dialog which only has the positive button. */
+public class AlertDialogFragment extends BaseDialogFragment
+        implements DialogInterface.OnClickListener {
+    private static final String TAG = "AlertDialogFragment";
+
+    // Arguments
+    private static final String ARG_TITLE = "title";
+    private static final String ARG_MSG = "msg";
+
+    /**
+     * @param activity
+     * @param title
+     * @param msg
+     */
+    public static void show(Activity activity, String title, String msg) {
+        AlertDialogFragment fragment = new AlertDialogFragment();
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        arguments.putString(ARG_MSG, msg);
+        fragment.setArguments(arguments);
+        fragment.show(activity.getFragmentManager(), TAG);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getContext())
+                        .setTitle(getArguments().getString(ARG_TITLE))
+                        .setPositiveButton(android.R.string.ok, this);
+        if (!TextUtils.isEmpty(getArguments().getString(ARG_MSG))) {
+            builder.setMessage(getArguments().getString(ARG_MSG));
+        }
+        return builder.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
+        super.dismiss();
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index 8442de2..0e0e5d1 100644
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -32,7 +32,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/network/telephony/BaseDialogFragment.java b/src/com/android/settings/network/telephony/BaseDialogFragment.java
new file mode 100644
index 0000000..7da3259
--- /dev/null
+++ b/src/com/android/settings/network/telephony/BaseDialogFragment.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Base dialog fragment class with the functionality to make a fragment or an activity as a listener
+ * which can survive through the activity restarts.
+ */
+public abstract class BaseDialogFragment extends DialogFragment {
+    // Tags for the listener which receives event callbacks.
+    private static final String ARG_LISTENER_TAG = "listener_tag";
+    private static final String ARG_IN_CALLER_TAG = "in_caller_tag";
+
+    /**
+     * @param activity The caller activity or the activity attached with the fragment.
+     * @param listener The original caller, that is, the listener. The listener can be the fragment
+     *     to receive event callbacks. If it is null, will use the activity to handle the event
+     *     callback instead.
+     * @param callbackInterfaceClass The interface that the listener should implements.
+     * @param arguments The arguments bundle of the dispatcher fragment used to store the listener's
+     *     info.
+     * @param tagInCaller An integer given by the listener to distinguish the action when calling
+     *     the listener's callback function.
+     */
+    protected static <T> void setListener(
+            Activity activity,
+            @Nullable Fragment listener,
+            Class<T> callbackInterfaceClass,
+            int tagInCaller,
+            Bundle arguments) {
+        checkValidity(activity, listener, callbackInterfaceClass);
+
+        if (listener != null && listener.getParentFragment() != null) {
+            throw new IllegalArgumentException("The listener must be attached to an activity.");
+        }
+        arguments.putInt(ARG_IN_CALLER_TAG, tagInCaller);
+        if (listener != null) {
+            arguments.putString(ARG_LISTENER_TAG, listener.getTag());
+        }
+    }
+
+    /**
+     * @param callbackInterfaceClass The interface that the listener should implements.
+     * @param <T> Template type.
+     * @return The listener class.
+     */
+    @SuppressWarnings("unchecked")
+    protected <T> T getListener(Class<T> callbackInterfaceClass) {
+        Object listener;
+        String listenerTag = getArguments().getString(ARG_LISTENER_TAG);
+        if (listenerTag == null) {
+            listener = getActivity();
+        } else {
+            listener = getActivity().getFragmentManager().findFragmentByTag(listenerTag);
+        }
+        if (callbackInterfaceClass.isInstance(listener)) {
+            return (T) listener;
+        }
+        throw new IllegalArgumentException("The caller should implement the callback function.");
+    }
+
+    /** @return The tag set in the listener. */
+    protected int getTagInCaller() {
+        return getArguments().getInt(ARG_IN_CALLER_TAG);
+    }
+
+    private static <T> void checkValidity(
+            Activity activity, @Nullable Fragment listener, Class<T> callbackInterfaceClass) {
+        if (listener != null) {
+            if (!callbackInterfaceClass.isInstance(listener)) {
+                throw new IllegalArgumentException(
+                        "The listener fragment should implement the callback function.");
+            }
+        } else {
+            if (!callbackInterfaceClass.isInstance(activity)) {
+                throw new IllegalArgumentException(
+                        "The caller activity should implement the callback function.");
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ConfirmDialogFragment.java b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
new file mode 100644
index 0000000..1ba99c5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+/** Fragment to show a confirm dialog. The caller should implement onConfirmListener. */
+public class ConfirmDialogFragment extends BaseDialogFragment
+        implements DialogInterface.OnClickListener {
+    private static final String TAG = "ConfirmDialogFragment";
+    private static final String ARG_TITLE = "title";
+    private static final String ARG_MSG = "msg";
+    private static final String ARG_POS_BUTTON_STRING = "pos_button_string";
+    private static final String ARG_NEG_BUTTON_STRING = "neg_button_string";
+
+    /**
+     * Interface defining the method that will be invoked when the user has done with the dialog.
+     */
+    public interface OnConfirmListener {
+        /**
+         * @param tag The tag in the caller.
+         * @param confirmed True if the user has clicked the positive button. False if the user has
+         *     clicked the negative button or cancel the dialog.
+         */
+        void onConfirm(int tag, boolean confirmed);
+    }
+
+    /** Displays a confirmation dialog which has confirm and cancel buttons. */
+    public static <T> void show(
+            Activity activity,
+            Class<T> callbackInterfaceClass,
+            int tagInCaller,
+            String title,
+            String msg,
+            String posButtonString,
+            String negButtonString) {
+        ConfirmDialogFragment fragment = new ConfirmDialogFragment();
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        arguments.putCharSequence(ARG_MSG, msg);
+        arguments.putString(ARG_POS_BUTTON_STRING, posButtonString);
+        arguments.putString(ARG_NEG_BUTTON_STRING, negButtonString);
+        setListener(activity, null, callbackInterfaceClass, tagInCaller, arguments);
+        fragment.setArguments(arguments);
+        fragment.show(activity.getFragmentManager(), TAG);
+    }
+
+    @Override
+    public final Dialog onCreateDialog(Bundle savedInstanceState) {
+        String title = getArguments().getString(ARG_TITLE);
+        String message = getArguments().getString(ARG_MSG);
+        String posBtnString = getArguments().getString(ARG_POS_BUTTON_STRING);
+        String negBtnString = getArguments().getString(ARG_NEG_BUTTON_STRING);
+
+        Log.i("Showing dialog with title = %s", title);
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getContext())
+                        .setTitle(title)
+                        .setPositiveButton(posBtnString, this)
+                        .setNegativeButton(negBtnString, this);
+
+        if (!TextUtils.isEmpty(message)) {
+            builder.setMessage(message);
+        }
+        AlertDialog dialog = builder.show();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        informCaller(which == DialogInterface.BUTTON_POSITIVE);
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        informCaller(false);
+    }
+
+    private void informCaller(boolean confirmed) {
+        OnConfirmListener listener = getListener(OnConfirmListener.class);
+        if (listener == null) {
+            return;
+        }
+        listener.onConfirm(getTagInCaller(), confirmed);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 625f863..1cd0e8e 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -90,12 +90,15 @@
 
     @Override
     public boolean isChecked() {
-        return mManager.isDataAllowedInVoiceCall();
+        return mManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        mManager.setDataAllowedDuringVoiceCall(isChecked);
+        mManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
+                isChecked);
         return true;
     }
 
diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
new file mode 100644
index 0000000..6186de3
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.SubscriptionUtil;
+
+import java.util.List;
+
+/** This dialog activity handles deleting eSIM profiles. */
+public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDialogActivity
+        implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+    private static final String TAG = "DeleteEuiccSubscriptionDialogActivity";
+    // Dialog tags
+    private static final int DIALOG_TAG_DELETE_SIM_CONFIRMATION = 1;
+
+    /**
+     * Returns an intent of DeleteEuiccSubscriptionDialogActivity.
+     *
+     * @param context The context used to start the DeleteEuiccSubscriptionDialogActivity.
+     * @param subId The subscription ID of the subscription needs to be deleted. If the subscription
+     *     belongs to a group of subscriptions, all subscriptions from the group will be deleted.
+     */
+    public static Intent getIntent(Context context, int subId) {
+        Intent intent = new Intent(context, DeleteEuiccSubscriptionDialogActivity.class);
+        intent.putExtra(ARG_SUB_ID, subId);
+        return intent;
+    }
+
+    private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar;
+    private List<SubscriptionInfo> mSubscriptionsToBeDeleted;
+    private SubscriptionInfo mSubscriptionToBeDeleted;
+    private AlertDialog mDeleteSimConfirmDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+        mSubscriptionsToBeDeleted =
+                SubscriptionUtil.findAllSubscriptionsInGroup(mSubscriptionManager, subId);
+        mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
+
+        if (mSubscriptionToBeDeleted == null || mDeleteEuiccSubscriptionSidecar == null) {
+            Log.e(TAG, "Cannot find subscription with sub ID: " + subId);
+            finish();
+            return;
+        }
+
+        if (savedInstanceState == null) {
+            showDeleteSimConfirmDialog();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mDeleteEuiccSubscriptionSidecar.addListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        mDeleteEuiccSubscriptionSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mDeleteEuiccSubscriptionSidecar) {
+            handleDeleteEuiccSubscriptionSidecarStateChange();
+        }
+    }
+
+    @Override
+    public void onConfirm(int tag, boolean confirmed) {
+        if (!confirmed) {
+            finish();
+            return;
+        }
+
+        switch (tag) {
+            case DIALOG_TAG_DELETE_SIM_CONFIRMATION:
+                Log.i(TAG, "Subscription deletion confirmed");
+                showProgressDialog(getString(R.string.erasing_sim));
+                mDeleteEuiccSubscriptionSidecar.run(mSubscriptionsToBeDeleted);
+                break;
+            default:
+                Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
+                break;
+        }
+    }
+
+    private void handleDeleteEuiccSubscriptionSidecarStateChange() {
+        switch (mDeleteEuiccSubscriptionSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(TAG, "Successfully delete the subscription.");
+                mDeleteEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.e(TAG, "Failed to delete the subscription.");
+                mDeleteEuiccSubscriptionSidecar.reset();
+                showErrorDialog(
+                        getString(R.string.erase_sim_fail_title),
+                        getString(R.string.erase_sim_fail_text));
+                break;
+        }
+    }
+
+    /* Displays the eSIM deleting confirmation dialog. */
+    private void showDeleteSimConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_DELETE_SIM_CONFIRMATION,
+                getString(R.string.erase_sim_dialog_title),
+                getString(
+                        R.string.erase_sim_dialog_text, mSubscriptionToBeDeleted.getDisplayName()),
+                getString(R.string.erase_sim_confirm_button),
+                getString(R.string.cancel));
+    }
+}
diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java
new file mode 100644
index 0000000..f03f33f
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.FragmentManager;
+import android.app.PendingIntent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.euicc.EuiccManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** A headless fragment encapsulating long-running eSIM erasing operations. */
+public class DeleteEuiccSubscriptionSidecar extends EuiccOperationSidecar {
+    private static final String TAG = "DeleteEuiccSubscriptionSidecar";
+    private static final String ACTION_DELETE_SUBSCRIPTION =
+            "com.android.settings.network.delete_subscription";
+
+    private List<SubscriptionInfo> mSubscriptions;
+
+    @Override
+    public String getReceiverAction() {
+        return ACTION_DELETE_SUBSCRIPTION;
+    }
+
+    /** Returns a DeleteEuiccSubscriptionSidecar sidecar instance. */
+    public static DeleteEuiccSubscriptionSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, DeleteEuiccSubscriptionSidecar.class, null /* args */);
+    }
+
+    /** Starts calling EuiccManager#deleteSubscription to delete the eSIM profile. */
+    public void run(List<SubscriptionInfo> subscriptions) {
+        if (subscriptions == null || subscriptions.isEmpty()) {
+            throw new IllegalArgumentException("Subscriptions cannot be empty.");
+        }
+
+        setState(State.RUNNING, Substate.UNUSED);
+
+        mSubscriptions = new ArrayList<>(subscriptions);
+        deleteSubscription();
+    }
+
+    @Override
+    protected void onActionReceived() {
+        if (getResultCode() == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK
+                && !mSubscriptions.isEmpty()) {
+            // Continue to delete remaining subscriptions.
+            deleteSubscription();
+        } else {
+            super.onActionReceived();
+        }
+    }
+
+    private void deleteSubscription() {
+        SubscriptionInfo subscription = mSubscriptions.remove(0);
+        PendingIntent intent = createCallbackIntent();
+        Log.i(TAG, "Deleting subscription ID: " + subscription.getSubscriptionId());
+        mEuiccManager.deleteSubscription(subscription.getSubscriptionId(), intent);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java b/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
index 44187e4..3035a9f 100644
--- a/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
+++ b/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
@@ -81,9 +81,8 @@
     }
 
     private void deleteSim() {
-        final Intent intent = new Intent(EuiccManager.ACTION_DELETE_SUBSCRIPTION_PRIVILEGED);
-        intent.putExtra(EuiccManager.EXTRA_SUBSCRIPTION_ID, mSubscriptionInfo.getSubscriptionId());
-        mParentFragment.startActivityForResult(intent, mRequestCode);
+        SubscriptionUtil.startDeleteEuiccSubscriptionDialogActivity(
+                mContext, mSubscriptionInfo.getSubscriptionId());
         // result handled in MobileNetworkSettings
     }
 
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index d6aed67..dc915af 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -225,6 +225,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
 
             final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
diff --git a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
new file mode 100644
index 0000000..3bda9c5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.Manifest;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.telephony.euicc.EuiccManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * The sidecar base class that an Euicc sidecar can extend from. The extended class should implement
+ * getReceiverAction() to return the action string for the broadcast receiver. The extended class
+ * should implement its own get() function to return an instance of that class, and implement the
+ * functional class like run() to actually trigger the function in EuiccManager.
+ */
+public abstract class EuiccOperationSidecar extends SidecarFragment {
+    private static final String TAG = "EuiccOperationSidecar";
+    private static final int REQUEST_CODE = 0;
+    private static final String EXTRA_OP_ID = "op_id";
+    private static AtomicInteger sCurrentOpId =
+            new AtomicInteger((int) SystemClock.elapsedRealtime());
+
+    protected EuiccManager mEuiccManager;
+
+    private int mResultCode;
+    private int mDetailedCode;
+    private Intent mResultIntent;
+    private int mOpId;
+
+    protected final BroadcastReceiver mReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    if (getReceiverAction().equals(intent.getAction())
+                            && mOpId == intent.getIntExtra(EXTRA_OP_ID, -1)) {
+                        mResultCode = getResultCode();
+                        /* TODO: This relies on our LUI and LPA to coexist, should think about how
+                        to generalize this further. */
+                        mDetailedCode =
+                                intent.getIntExtra(
+                                        EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE,
+                                        0 /* defaultValue*/);
+                        mResultIntent = intent;
+                        Log.i(
+                                TAG,
+                                String.format(
+                                        "Result code : %d; detailed code : %d",
+                                        mResultCode, mDetailedCode));
+                        onActionReceived();
+                    }
+                }
+            };
+
+    /**
+     * This is called when the broadcast action is received. The subclass may override this to
+     * perform different logic. The broadcast result code may be obtained with {@link
+     * #getResultCode()} and the Intent may be obtained with {@link #getResultIntent()}.
+     */
+    protected void onActionReceived() {
+        if (mResultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            setState(State.ERROR, mResultCode);
+        }
+    }
+
+    /**
+     * The extended class should implement it to return a string for the broadcast action. The class
+     * should be unique across all the child classes.
+     */
+    protected abstract String getReceiverAction();
+
+    protected PendingIntent createCallbackIntent() {
+        mOpId = sCurrentOpId.incrementAndGet();
+        Intent intent = new Intent(getReceiverAction());
+        intent.putExtra(EXTRA_OP_ID, mOpId);
+        return PendingIntent.getBroadcast(
+                getContext(), REQUEST_CODE, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mEuiccManager = (EuiccManager) getContext().getSystemService(Context.EUICC_SERVICE);
+
+        getContext()
+                .getApplicationContext()
+                .registerReceiver(
+                        mReceiver,
+                        new IntentFilter(getReceiverAction()),
+                        Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS,
+                        null);
+    }
+
+    @Override
+    public void onDestroy() {
+        getContext().getApplicationContext().unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
+    public int getResultCode() {
+        return mResultCode;
+    }
+
+    public int getDetailedCode() {
+        return mDetailedCode;
+    }
+
+    public Intent getResultIntent() {
+        return mResultIntent;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
index 07b808f..e3db5eb 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -88,7 +88,10 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
+        mTelephonyManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
+        return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
index 3911fb8..78dfe51 100644
--- a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
@@ -55,6 +55,13 @@
         super.updateState(preference);
 
         if (preference != null) {
+            // This is necessary to ensure that setting the title to the spannable string returned
+            // by getFooterText will be accepted.  Internally, setTitle does an equality check on
+            // the spannable string being set to the text already set on the preference.  That
+            // equality check apparently only takes into account the raw text and not and spannables
+            // that are part of the text.  So we clear the title before applying the spannable
+            // footer to ensure it is accepted.
+            preference.setTitle("");
             preference.setTitle(getFooterText());
         }
     }
diff --git a/src/com/android/settings/network/telephony/ProgressDialogFragment.java b/src/com/android/settings/network/telephony/ProgressDialogFragment.java
new file mode 100644
index 0000000..0d1b657
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ProgressDialogFragment.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+
+/** Fragment to show a progress dialog. */
+public class ProgressDialogFragment extends DialogFragment {
+    private static final String ARG_TITLE = "title";
+
+    private static final String TAG = "ProgressDialogFragment";
+
+    private OnDismissCallback mDismissCallback;
+
+    // Host fragment is optional to implement this interface.
+    public interface OnDismissCallback {
+        // Action performed when the progress dialog is dismissed.
+        void onProgressDialogDismiss();
+    }
+
+    /**
+     * Check whether there is already a showing progress dialog. If yes and the title of the showing
+     * one is the same with the new coming one, just return and do nothing. If the title of the
+     * showing one is different from the new one, remove the showing one and create a new dialog for
+     * the new one. If there is no progress dialog right now, just create a new one.
+     */
+    public static void show(FragmentManager fm, String title, OnDismissCallback dismissCallback) {
+        ProgressDialogFragment fragment = (ProgressDialogFragment) fm.findFragmentByTag(TAG);
+        if (fragment != null
+                && TextUtils.equals(fragment.getArguments().getString(ARG_TITLE), title)) {
+            return;
+        }
+
+        FragmentTransaction ft = fm.beginTransaction();
+        if (fragment != null) {
+            ft.remove(fragment);
+        }
+
+        fragment = new ProgressDialogFragment();
+        fragment.setDismissCallback(dismissCallback);
+
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        fragment.setArguments(arguments);
+        fragment.show(ft, TAG);
+    }
+
+    /**
+     * Called by the caller activity or fragment when the progress is finished.
+     *
+     * @param fm The fragment manager.
+     */
+    public static void dismiss(FragmentManager fm) {
+        DialogFragment fragment = (DialogFragment) fm.findFragmentByTag(TAG);
+        if (fragment != null) {
+            fragment.dismiss();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("deprecation") // ProgressDialog is deprecated but is intended UX for now
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        ProgressDialog dialog = new ProgressDialog(getActivity());
+        dialog.setCancelable(false);
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setMessage(getArguments().getString(ARG_TITLE));
+        dialog.setOnKeyListener(
+                (progressDialog, keyCode, event) -> KeyEvent.KEYCODE_BACK == keyCode);
+
+        return dialog;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (mDismissCallback != null) {
+            mDismissCallback.onProgressDialogDismiss();
+        }
+    }
+
+    private void setDismissCallback(OnDismissCallback dismissCallback) {
+        mDismissCallback = dismissCallback;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
new file mode 100644
index 0000000..7ff0d9a
--- /dev/null
+++ b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+
+/** The base class for subscription action dialogs */
+public class SubscriptionActionDialogActivity extends Activity {
+
+    private static final String TAG = "SubscriptionActionDialogActivity";
+    // Arguments
+    protected static final String ARG_SUB_ID = "sub_id";
+
+    protected SubscriptionManager mSubscriptionManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mSubscriptionManager = getSystemService(SubscriptionManager.class);
+    }
+
+    /**
+     * Displays a loading dialog.
+     *
+     * @param message The string content should be displayed in the progress dialog.
+     */
+    protected void showProgressDialog(String message) {
+        ProgressDialogFragment.show(getFragmentManager(), message, null);
+    }
+
+    /** Dismisses the loading dialog. */
+    protected void dismissProgressDialog() {
+        ProgressDialogFragment.dismiss(getFragmentManager());
+    }
+
+    /**
+     * Displays an error dialog to indicate the subscription action failure.
+     *
+     * @param title The title of the error dialog.
+     * @param message The body text of the error dialog.
+     */
+    protected void showErrorDialog(String title, String message) {
+        AlertDialogFragment.show(this, title, message);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
new file mode 100644
index 0000000..905ead0
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+
+/** This dialog activity handles both eSIM and pSIM subscriptions enabling and disabling. */
+public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogActivity
+        implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+    private static final String TAG = "ToggleSubscriptionDialogActivity";
+    // Arguments
+    private static final String ARG_enable = "enable";
+    // Dialog tags
+    private static final int DIALOG_TAG_DISABLE_SIM_CONFIRMATION = 1;
+
+    /**
+     * Returns an intent of ToggleSubscriptionDialogActivity.
+     *
+     * @param context The context used to start the ToggleSubscriptionDialogActivity.
+     * @param subId The subscription ID of the subscription needs to be toggled.
+     * @param enable Whether the activity should enable or disable the subscription.
+     */
+    public static Intent getIntent(Context context, int subId, boolean enable) {
+        Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class);
+        intent.putExtra(ARG_SUB_ID, subId);
+        intent.putExtra(ARG_enable, enable);
+        return intent;
+    }
+
+    private SubscriptionInfo mSubInfo;
+    private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
+    private AlertDialog mToggleSimConfirmDialog;
+    private boolean mEnable;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        UserManager userManager = getSystemService(UserManager.class);
+        if (!userManager.isAdminUser()) {
+            Log.e(TAG, "It is not the admin user. Unable to toggle subscription.");
+            finish();
+            return;
+        }
+
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            Log.e(TAG, "The subscription id is not usable.");
+            finish();
+            return;
+        }
+
+        mSubInfo = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+        mSwitchToEuiccSubscriptionSidecar =
+                SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+        mEnable = intent.getBooleanExtra(ARG_enable, true);
+
+        if (savedInstanceState == null) {
+            if (mEnable) {
+                handleEnablingSubAction();
+            } else {
+                showDisableSimConfirmDialog();
+            }
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mSwitchToEuiccSubscriptionSidecar.addListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        mSwitchToEuiccSubscriptionSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchToEuiccSubscriptionSidecar) {
+            handleSwitchToEuiccSubscriptionSidecarStateChange();
+        }
+    }
+
+    @Override
+    public void onConfirm(int tag, boolean confirmed) {
+        if (!confirmed) {
+            finish();
+            return;
+        }
+
+        switch (tag) {
+            case DIALOG_TAG_DISABLE_SIM_CONFIRMATION:
+                if (mSubInfo.isEmbedded()) {
+                    Log.i(TAG, "Disabling the eSIM profile.");
+                    showProgressDialog(
+                            getString(R.string.privileged_action_disable_sub_dialog_progress));
+                    mSwitchToEuiccSubscriptionSidecar.run(
+                            SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                    return;
+                }
+                Log.i(TAG, "Disabling the pSIM profile.");
+                break;
+            default:
+                Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
+                break;
+        }
+    }
+
+    private void handleSwitchToEuiccSubscriptionSidecarStateChange() {
+        switch (mSwitchToEuiccSubscriptionSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(
+                        TAG,
+                        String.format(
+                                "Successfully %s the eSIM profile.",
+                                mEnable ? "enable" : "disable"));
+                mSwitchToEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.i(
+                        TAG,
+                        String.format(
+                                "Failed to %s the eSIM profile.", mEnable ? "enable" : "disable"));
+                mSwitchToEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                showErrorDialog(
+                        getString(R.string.privileged_action_disable_fail_title),
+                        getString(R.string.privileged_action_disable_fail_text));
+                break;
+        }
+    }
+
+    /* Handles the enabling SIM action. */
+    private void handleEnablingSubAction() {
+        Log.i(TAG, "handleEnableSub");
+        // TODO(b/160819390): Implement enabling eSIM/pSIM profile.
+    }
+
+    /* Displays the SIM toggling confirmation dialog. */
+    private void showDisableSimConfirmDialog() {
+        String title =
+                mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())
+                        ? getString(
+                                R.string.privileged_action_disable_sub_dialog_title_without_carrier)
+                        : getString(
+                                R.string.privileged_action_disable_sub_dialog_title,
+                                mSubInfo.getDisplayName());
+
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_DISABLE_SIM_CONFIRMATION,
+                title,
+                null,
+                getString(R.string.yes),
+                getString(R.string.cancel));
+    }
+
+    /* Dismisses the SIM toggling confirmation dialog. */
+    private void dismissToggleSimConfirmDialog() {
+        if (mToggleSimConfirmDialog != null) {
+            mToggleSimConfirmDialog.dismiss();
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index 3321fb3..fa8b47f 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -182,6 +182,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 32be36e..b38fe07 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -210,6 +210,9 @@
 
         public void register(Context context, int subId) {
             mTelephonyManager = getTelephonyManager(context, subId);
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java
index 6d3c96d..eaff9e1 100644
--- a/src/com/android/settings/notification/RemoteVolumeGroupController.java
+++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.text.TextUtils;
 
@@ -57,6 +58,8 @@
 
     @VisibleForTesting
     LocalMediaManager mLocalMediaManager;
+    @VisibleForTesting
+    MediaRouter2Manager mRouterManager;
 
     public RemoteVolumeGroupController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -65,6 +68,7 @@
             mLocalMediaManager.registerCallback(this);
             mLocalMediaManager.startScan();
         }
+        mRouterManager = MediaRouter2Manager.getInstance(context);
     }
 
     @Override
@@ -98,38 +102,80 @@
         mLocalMediaManager.stopScan();
     }
 
-    private void refreshPreference() {
-        mPreferenceCategory.removeAll();
+    private synchronized void refreshPreference() {
         if (!isAvailable()) {
             mPreferenceCategory.setVisible(false);
             return;
         }
         final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title);
         mPreferenceCategory.setVisible(true);
-
         for (RoutingSessionInfo info : mRoutingSessionInfos) {
-            if (mPreferenceCategory.findPreference(info.getId()) != null) {
+            final CharSequence appName = Utils.getApplicationLabel(mContext,
+                    info.getClientPackageName());
+            RemoteVolumeSeekBarPreference seekBarPreference = mPreferenceCategory.findPreference(
+                    info.getId());
+            if (seekBarPreference != null) {
+                // Update slider
+                if (seekBarPreference.getProgress() != info.getVolume()) {
+                    seekBarPreference.setProgress(info.getVolume());
+                }
+            } else {
+                // Add slider
+                seekBarPreference = new RemoteVolumeSeekBarPreference(mContext);
+                seekBarPreference.setKey(info.getId());
+                seekBarPreference.setTitle(castVolume);
+                seekBarPreference.setMax(info.getVolumeMax());
+                seekBarPreference.setProgress(info.getVolume());
+                seekBarPreference.setMin(0);
+                seekBarPreference.setOnPreferenceChangeListener(this);
+                seekBarPreference.setIcon(R.drawable.ic_volume_remote);
+                mPreferenceCategory.addPreference(seekBarPreference);
+            }
+
+            Preference switcherPreference = mPreferenceCategory.findPreference(
+                    SWITCHER_PREFIX + info.getId());
+            final boolean isMediaOutputDisabled = mLocalMediaManager.shouldDisableMediaOutput(
+                    info.getClientPackageName());
+            final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
+                    appName);
+            if (switcherPreference != null) {
+                // Update output indicator
+                switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
+                switcherPreference.setSummary(info.getName());
+                switcherPreference.setEnabled(!isMediaOutputDisabled);
+            } else {
+                // Add output indicator
+                switcherPreference = new Preference(mContext);
+                switcherPreference.setKey(SWITCHER_PREFIX + info.getId());
+                switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
+                switcherPreference.setSummary(info.getName());
+                switcherPreference.setEnabled(!isMediaOutputDisabled);
+                mPreferenceCategory.addPreference(switcherPreference);
+            }
+        }
+
+        // Check and remove non-active session preference
+        // There is a pair of preferences for each session. First one is a seekBar preference.
+        // The second one shows the session information and provide an entry-point to launch output
+        // switcher. It is unnecessary to go through all preferences. It is fine ignore the second
+        // preference and only to check the seekBar's key value.
+        for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i = i + 2) {
+            final Preference preference = mPreferenceCategory.getPreference(i);
+            boolean isActive = false;
+            for (RoutingSessionInfo info : mRoutingSessionInfos) {
+                if (TextUtils.equals(preference.getKey(), info.getId())) {
+                    isActive = true;
+                    break;
+                }
+            }
+            if (isActive) {
                 continue;
             }
-            final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
-                    Utils.getApplicationLabel(mContext, info.getClientPackageName()));
-            // Add slider
-            final RemoteVolumeSeekBarPreference seekBarPreference =
-                    new RemoteVolumeSeekBarPreference(mContext);
-            seekBarPreference.setKey(info.getId());
-            seekBarPreference.setTitle(castVolume);
-            seekBarPreference.setMax(info.getVolumeMax());
-            seekBarPreference.setProgress(info.getVolume());
-            seekBarPreference.setMin(0);
-            seekBarPreference.setOnPreferenceChangeListener(this);
-            seekBarPreference.setIcon(R.drawable.ic_volume_remote);
-            mPreferenceCategory.addPreference(seekBarPreference);
-            // Add output indicator
-            final Preference preference = new Preference(mContext);
-            preference.setKey(SWITCHER_PREFIX + info.getId());
-            preference.setTitle(outputTitle);
-            preference.setSummary(info.getName());
-            mPreferenceCategory.addPreference(preference);
+            final Preference switcherPreference = mPreferenceCategory.getPreference(i + 1);
+            if (switcherPreference != null) {
+                mPreferenceCategory.removePreference(preference);
+                mPreferenceCategory.removePreference(switcherPreference);
+            }
         }
     }
 
@@ -150,11 +196,11 @@
             if (TextUtils.equals(info.getId(),
                     preference.getKey().substring(SWITCHER_PREFIX.length()))) {
                 final Intent intent = new Intent()
-                        .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                        .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
                         .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
                                 info.getClientPackageName());
-                mContext.startActivity(intent);
+                mContext.sendBroadcast(intent);
                 return true;
             }
         }
@@ -172,8 +218,10 @@
             // Preference group is not ready.
             return;
         }
-        initRemoteMediaSession();
-        refreshPreference();
+        ThreadUtils.postOnMainThread(() -> {
+            initRemoteMediaSession();
+            refreshPreference();
+        });
     }
 
     @Override
diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index d45bfd1..b5e807d 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.panel;
 
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.REMOTE_MEDIA_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_ALARM_URI;
@@ -24,20 +27,40 @@
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;
 
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.provider.Settings;
 
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
 import com.android.settings.R;
+import com.android.settingslib.media.MediaOutputSliceConstants;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class VolumePanel implements PanelContent {
+/**
+ * Panel data class for Volume settings.
+ */
+public class VolumePanel implements PanelContent, LifecycleObserver {
 
     private final Context mContext;
 
+    private PanelContentCallback mCallback;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (MediaOutputSliceConstants.ACTION_CLOSE_PANEL.equals(intent.getAction())) {
+                mCallback.forceClose();
+            }
+        }
+    };
+
     public static VolumePanel create(Context context) {
         return new VolumePanel(context);
     }
@@ -46,6 +69,20 @@
         mContext = context.getApplicationContext();
     }
 
+    /** Invoked when the panel is resumed. */
+    @OnLifecycleEvent(ON_RESUME)
+    public void onResume() {
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL);
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    /** Invoked when the panel is paused. */
+    @OnLifecycleEvent(ON_PAUSE)
+    public void onPause() {
+        mContext.unregisterReceiver(mReceiver);
+    }
+
     @Override
     public CharSequence getTitle() {
         return mContext.getText(R.string.sound_settings);
@@ -78,4 +115,9 @@
     public int getViewType() {
         return PanelContent.VIEW_TYPE_SLIDER;
     }
+
+    @Override
+    public void registerCallback(PanelContentCallback callback) {
+        mCallback = callback;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index da92b2b..7c3d2b1 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -133,10 +133,13 @@
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
-            final Intent intent = new Intent()
-                    .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mContext.startActivity(intent);
+            mContext.sendBroadcast(new Intent()
+                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                    .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                            mMediaController.getPackageName())
+                    .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
+                            mMediaController.getSessionToken()));
             return true;
         }
         return false;
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
deleted file mode 100644
index 6b5e670..0000000
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import java.io.File;
-
-/**
- * This class encapsulates a Dialog for editing the user nickname and photo.
- */
-public class EditUserInfoController {
-
-    private static final String KEY_AWAITING_RESULT = "awaiting_result";
-    private static final String KEY_SAVED_PHOTO = "pending_photo";
-
-    private Dialog mEditUserInfoDialog;
-    private Bitmap mSavedPhoto;
-    private EditUserPhotoController mEditUserPhotoController;
-    private UserHandle mUser;
-    private UserManager mUserManager;
-    private boolean mWaitingForActivityResult = false;
-
-    /**
-     * Callback made when either the username text or photo choice changes.
-     */
-    public interface OnContentChangedCallback {
-        /** Photo updated. */
-        void onPhotoChanged(UserHandle user, Drawable photo);
-        /** Username updated. */
-        void onLabelChanged(UserHandle user, CharSequence label);
-    }
-
-    /**
-     * Callback made when the dialog finishes.
-     */
-    public interface OnDialogCompleteCallback {
-        /** Dialog closed with positive button. */
-        void onPositive();
-        /** Dialog closed with negative button or cancelled. */
-        void onNegativeOrCancel();
-    }
-
-    public void clear() {
-        if (mEditUserPhotoController != null) {
-            mEditUserPhotoController.removeNewUserPhotoBitmapFile();
-        }
-        mEditUserInfoDialog = null;
-        mSavedPhoto = null;
-    }
-
-    public Dialog getDialog() {
-        return mEditUserInfoDialog;
-    }
-
-    public void onRestoreInstanceState(Bundle icicle) {
-        String pendingPhoto = icicle.getString(KEY_SAVED_PHOTO);
-        if (pendingPhoto != null) {
-            mSavedPhoto = EditUserPhotoController.loadNewUserPhotoBitmap(new File(pendingPhoto));
-        }
-        mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
-            // Bitmap cannot be stored into bundle because it may exceed parcel limit
-            // Store it in a temporary file instead
-            File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
-            if (file != null) {
-                outState.putString(KEY_SAVED_PHOTO, file.getPath());
-            }
-        }
-        if (mWaitingForActivityResult) {
-            outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
-        }
-    }
-
-    public void startingActivityForResult() {
-        mWaitingForActivityResult = true;
-    }
-
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        mWaitingForActivityResult = false;
-
-        if (mEditUserPhotoController != null && mEditUserInfoDialog != null) {
-            mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    public Dialog createDialog(final Fragment fragment, final Drawable currentUserIcon,
-            final CharSequence currentUserName,
-            String title, final OnContentChangedCallback callback, UserHandle user,
-            OnDialogCompleteCallback completeCallback) {
-        Activity activity = fragment.getActivity();
-        mUser = user;
-        if (mUserManager == null) {
-            mUserManager = activity.getSystemService(UserManager.class);
-        }
-        LayoutInflater inflater = activity.getLayoutInflater();
-        View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
-
-        final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
-        userNameView.setText(currentUserName);
-
-        final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
-
-        boolean canChangePhoto = mUserManager != null &&
-                canChangePhoto(activity, mUserManager.getUserInfo(user.getIdentifier()));
-        if (!canChangePhoto) {
-            // some users can't change their photos so we need to remove suggestive
-            // background from the photoView
-            userPhotoView.setBackground(null);
-        }
-        Drawable drawable = null;
-        if (mSavedPhoto != null) {
-            drawable = CircleFramedDrawable.getInstance(activity, mSavedPhoto);
-        } else {
-            drawable = currentUserIcon;
-        }
-        userPhotoView.setImageDrawable(drawable);
-        if (canChangePhoto) {
-            mEditUserPhotoController =
-                    createEditUserPhotoController(fragment, userPhotoView, drawable);
-        }
-        mEditUserInfoDialog = new AlertDialog.Builder(activity)
-                .setTitle(title)
-                .setView(content)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == DialogInterface.BUTTON_POSITIVE) {
-                            // Update the name if changed.
-                            CharSequence userName = userNameView.getText();
-                            if (!TextUtils.isEmpty(userName)) {
-                                if (currentUserName == null
-                                        || !userName.toString().equals(
-                                        currentUserName.toString())) {
-                                    if (callback != null) {
-                                        callback.onLabelChanged(mUser, userName.toString());
-                                    }
-                                }
-                            }
-                            // Update the photo if changed.
-                            if (mEditUserPhotoController != null) {
-                                Drawable drawable =
-                                        mEditUserPhotoController.getNewUserPhotoDrawable();
-                                if (drawable != null && !drawable.equals(currentUserIcon)) {
-                                    if (callback != null) {
-                                        callback.onPhotoChanged(mUser, drawable);
-                                    }
-                                }
-                            }
-                        }
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onPositive();
-                        }
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onNegativeOrCancel();
-                        }
-                    }
-                })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onNegativeOrCancel();
-                        }
-                    }
-                })
-                .create();
-
-        // Make sure the IME is up.
-        mEditUserInfoDialog.getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-        return mEditUserInfoDialog;
-    }
-
-    @VisibleForTesting
-    boolean canChangePhoto(Context context, UserInfo user) {
-        return PhotoCapabilityUtils.canCropPhoto(context) &&
-                (PhotoCapabilityUtils.canChoosePhoto(context)
-                        || PhotoCapabilityUtils.canTakePhoto(context));
-    }
-
-    @VisibleForTesting
-    EditUserPhotoController createEditUserPhotoController(Fragment fragment,
-            ImageView userPhotoView, Drawable drawable) {
-        return new EditUserPhotoController(fragment, userPhotoView,
-                mSavedPhoto, drawable, mWaitingForActivityResult);
-    }
-}
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
deleted file mode 100644
index a20513a..0000000
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.StrictMode;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.ContactsContract.DisplayPhoto;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListPopupWindow;
-import android.widget.TextView;
-
-import androidx.core.content.FileProvider;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import libcore.io.Streams;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EditUserPhotoController {
-    private static final String TAG = "EditUserPhotoController";
-
-    // It seems that this class generates custom request codes and they may
-    // collide with ours, these values are very unlikely to have a conflict.
-    private static final int REQUEST_CODE_CHOOSE_PHOTO = 1001;
-    private static final int REQUEST_CODE_TAKE_PHOTO   = 1002;
-    private static final int REQUEST_CODE_CROP_PHOTO   = 1003;
-
-    private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
-    private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
-    private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";
-
-    private final int mPhotoSize;
-
-    private final Context mContext;
-    private final Fragment mFragment;
-    private final ImageView mImageView;
-
-    private final Uri mCropPictureUri;
-    private final Uri mTakePictureUri;
-
-    private Bitmap mNewUserPhotoBitmap;
-    private Drawable mNewUserPhotoDrawable;
-
-    public EditUserPhotoController(Fragment fragment, ImageView view,
-            Bitmap bitmap, Drawable drawable, boolean waiting) {
-        mContext = view.getContext();
-        mFragment = fragment;
-        mImageView = view;
-        mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
-        mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
-        mPhotoSize = getPhotoSize(mContext);
-        mImageView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showUpdatePhotoPopup();
-            }
-        });
-        mNewUserPhotoBitmap = bitmap;
-        mNewUserPhotoDrawable = drawable;
-    }
-
-    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != Activity.RESULT_OK) {
-            return false;
-        }
-        final Uri pictureUri = data != null && data.getData() != null
-                ? data.getData() : mTakePictureUri;
-        switch (requestCode) {
-            case REQUEST_CODE_CROP_PHOTO:
-                onPhotoCropped(pictureUri, true);
-                return true;
-            case REQUEST_CODE_TAKE_PHOTO:
-            case REQUEST_CODE_CHOOSE_PHOTO:
-                if (mTakePictureUri.equals(pictureUri)) {
-                    cropPhoto();
-                } else {
-                    copyAndCropPhoto(pictureUri);
-                }
-                return true;
-        }
-        return false;
-    }
-
-    public Bitmap getNewUserPhotoBitmap() {
-        return mNewUserPhotoBitmap;
-    }
-
-    public Drawable getNewUserPhotoDrawable() {
-        return mNewUserPhotoDrawable;
-    }
-
-    private void showUpdatePhotoPopup() {
-        final Context context = mImageView.getContext();
-        final boolean canTakePhoto = PhotoCapabilityUtils.canTakePhoto(context);
-        final boolean canChoosePhoto = PhotoCapabilityUtils.canChoosePhoto(context);
-
-        if (!canTakePhoto && !canChoosePhoto) {
-            return;
-        }
-
-        final List<EditUserPhotoController.RestrictedMenuItem> items = new ArrayList<>();
-
-        if (canTakePhoto) {
-            final String title = context.getString(R.string.user_image_take_photo);
-            final Runnable action = new Runnable() {
-                @Override
-                public void run() {
-                    takePhoto();
-                }
-            };
-            items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
-                    action));
-        }
-
-        if (canChoosePhoto) {
-            final String title = context.getString(R.string.user_image_choose_photo);
-            final Runnable action = new Runnable() {
-                @Override
-                public void run() {
-                    choosePhoto();
-                }
-            };
-            items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
-                    action));
-        }
-
-        final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
-
-        listPopupWindow.setAnchorView(mImageView);
-        listPopupWindow.setModal(true);
-        listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
-        listPopupWindow.setAdapter(new RestrictedPopupMenuAdapter(context, items));
-
-        final int width = Math.max(mImageView.getWidth(), context.getResources()
-                .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
-        listPopupWindow.setWidth(width);
-        listPopupWindow.setDropDownGravity(Gravity.START);
-
-        listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                listPopupWindow.dismiss();
-                final RestrictedMenuItem item =
-                        (RestrictedMenuItem) parent.getAdapter().getItem(position);
-                item.doAction();
-            }
-        });
-
-        listPopupWindow.show();
-    }
-
-    private void takePhoto() {
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        appendOutputExtra(intent, mTakePictureUri);
-        mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
-    }
-
-    private void choosePhoto() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
-        intent.setType("image/*");
-        appendOutputExtra(intent, mTakePictureUri);
-        mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
-    }
-
-    private void copyAndCropPhoto(final Uri pictureUri) {
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                final ContentResolver cr = mContext.getContentResolver();
-                try (InputStream in = cr.openInputStream(pictureUri);
-                        OutputStream out = cr.openOutputStream(mTakePictureUri)) {
-                    Streams.copy(in, out);
-                } catch (IOException e) {
-                    Log.w(TAG, "Failed to copy photo", e);
-                }
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void result) {
-                if (!mFragment.isAdded()) return;
-                cropPhoto();
-            }
-        }.execute();
-    }
-
-    private void cropPhoto() {
-        // TODO: Use a public intent, when there is one.
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setDataAndType(mTakePictureUri, "image/*");
-        appendOutputExtra(intent, mCropPictureUri);
-        appendCropExtras(intent);
-        if (intent.resolveActivity(mContext.getPackageManager()) != null) {
-            try {
-                StrictMode.disableDeathOnFileUriExposure();
-                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
-            } finally {
-                StrictMode.enableDeathOnFileUriExposure();
-            }
-        } else {
-            onPhotoCropped(mTakePictureUri, false);
-        }
-    }
-
-    private void appendOutputExtra(Intent intent, Uri pictureUri) {
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
-        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
-    }
-
-    private void appendCropExtras(Intent intent) {
-        intent.putExtra("crop", "true");
-        intent.putExtra("scale", true);
-        intent.putExtra("scaleUpIfNeeded", true);
-        intent.putExtra("aspectX", 1);
-        intent.putExtra("aspectY", 1);
-        intent.putExtra("outputX", mPhotoSize);
-        intent.putExtra("outputY", mPhotoSize);
-    }
-
-    private void onPhotoCropped(final Uri data, final boolean cropped) {
-        new AsyncTask<Void, Void, Bitmap>() {
-            @Override
-            protected Bitmap doInBackground(Void... params) {
-                if (cropped) {
-                    InputStream imageStream = null;
-                    try {
-                        imageStream = mContext.getContentResolver()
-                                .openInputStream(data);
-                        return BitmapFactory.decodeStream(imageStream);
-                    } catch (FileNotFoundException fe) {
-                        Log.w(TAG, "Cannot find image file", fe);
-                        return null;
-                    } finally {
-                        if (imageStream != null) {
-                            try {
-                                imageStream.close();
-                            } catch (IOException ioe) {
-                                Log.w(TAG, "Cannot close image stream", ioe);
-                            }
-                        }
-                    }
-                } else {
-                    // Scale and crop to a square aspect ratio
-                    Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
-                            Config.ARGB_8888);
-                    Canvas canvas = new Canvas(croppedImage);
-                    Bitmap fullImage = null;
-                    try {
-                        InputStream imageStream = mContext.getContentResolver()
-                                .openInputStream(data);
-                        fullImage = BitmapFactory.decodeStream(imageStream);
-                    } catch (FileNotFoundException fe) {
-                        return null;
-                    }
-                    if (fullImage != null) {
-                        final int squareSize = Math.min(fullImage.getWidth(),
-                                fullImage.getHeight());
-                        final int left = (fullImage.getWidth() - squareSize) / 2;
-                        final int top = (fullImage.getHeight() - squareSize) / 2;
-                        Rect rectSource = new Rect(left, top,
-                                left + squareSize, top + squareSize);
-                        Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
-                        Paint paint = new Paint();
-                        canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
-                        return croppedImage;
-                    } else {
-                        // Bah! Got nothin.
-                        return null;
-                    }
-                }
-            }
-
-            @Override
-            protected void onPostExecute(Bitmap bitmap) {
-                if (bitmap != null) {
-                    mNewUserPhotoBitmap = bitmap;
-                    mNewUserPhotoDrawable = CircleFramedDrawable
-                            .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
-                    mImageView.setImageDrawable(mNewUserPhotoDrawable);
-                }
-                new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
-                new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-    }
-
-    private static int getPhotoSize(Context context) {
-        Cursor cursor = context.getContentResolver().query(
-                DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
-                new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
-        try {
-            cursor.moveToFirst();
-            return cursor.getInt(0);
-        } finally {
-            cursor.close();
-        }
-    }
-
-    private Uri createTempImageUri(Context context, String fileName, boolean purge) {
-        final File folder = context.getCacheDir();
-        folder.mkdirs();
-        final File fullPath = new File(folder, fileName);
-        if (purge) {
-            fullPath.delete();
-        }
-        return FileProvider.getUriForFile(context, Utils.FILE_PROVIDER_AUTHORITY, fullPath);
-    }
-
-    File saveNewUserPhotoBitmap() {
-        if (mNewUserPhotoBitmap == null) {
-            return null;
-        }
-        try {
-            File file = new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME);
-            OutputStream os = new FileOutputStream(file);
-            mNewUserPhotoBitmap.compress(Bitmap.CompressFormat.PNG, 100, os);
-            os.flush();
-            os.close();
-            return file;
-        } catch (IOException e) {
-            Log.e(TAG, "Cannot create temp file", e);
-        }
-        return null;
-    }
-
-    static Bitmap loadNewUserPhotoBitmap(File file) {
-        return BitmapFactory.decodeFile(file.getAbsolutePath());
-    }
-
-    void removeNewUserPhotoBitmapFile() {
-        new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME).delete();
-    }
-
-    private static final class RestrictedMenuItem {
-        private final Context mContext;
-        private final String mTitle;
-        private final Runnable mAction;
-        private final RestrictedLockUtils.EnforcedAdmin mAdmin;
-        // Restriction may be set by system or something else via UserManager.setUserRestriction().
-        private final boolean mIsRestrictedByBase;
-
-        /**
-         * The menu item, used for popup menu. Any element of such a menu can be disabled by admin.
-         * @param context A context.
-         * @param title The title of the menu item.
-         * @param restriction The restriction, that if is set, blocks the menu item.
-         * @param action The action on menu item click.
-         */
-        public RestrictedMenuItem(Context context, String title, String restriction,
-                Runnable action) {
-            mContext = context;
-            mTitle = title;
-            mAction = action;
-
-            final int myUserId = UserHandle.myUserId();
-            mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
-                    restriction, myUserId);
-            mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
-                    restriction, myUserId);
-        }
-
-        @Override
-        public String toString() {
-            return mTitle;
-        }
-
-        final void doAction() {
-            if (isRestrictedByBase()) {
-                return;
-            }
-
-            if (isRestrictedByAdmin()) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mAdmin);
-                return;
-            }
-
-            mAction.run();
-        }
-
-        final boolean isRestrictedByAdmin() {
-            return mAdmin != null;
-        }
-
-        final boolean isRestrictedByBase() {
-            return mIsRestrictedByBase;
-        }
-    }
-
-    /**
-     * Provide this adapter to ListPopupWindow.setAdapter() to have a popup window menu, where
-     * any element can be restricted by admin (profile owner or device owner).
-     */
-    private static final class RestrictedPopupMenuAdapter extends ArrayAdapter<RestrictedMenuItem> {
-        public RestrictedPopupMenuAdapter(Context context, List<RestrictedMenuItem> items) {
-            super(context, R.layout.restricted_popup_menu_item, R.id.text, items);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final View view = super.getView(position, convertView, parent);
-            final RestrictedMenuItem item = getItem(position);
-            final TextView text = (TextView) view.findViewById(R.id.text);
-            final ImageView image = (ImageView) view.findViewById(R.id.restricted_icon);
-
-            text.setEnabled(!item.isRestrictedByAdmin() && !item.isRestrictedByBase());
-            image.setVisibility(item.isRestrictedByAdmin() && !item.isRestrictedByBase() ?
-                    ImageView.VISIBLE : ImageView.GONE);
-
-            return view;
-        }
-    }
-}
diff --git a/src/com/android/settings/users/PhotoCapabilityUtils.java b/src/com/android/settings/users/PhotoCapabilityUtils.java
deleted file mode 100644
index 1e09857..0000000
--- a/src/com/android/settings/users/PhotoCapabilityUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.provider.MediaStore;
-
-class PhotoCapabilityUtils {
-
-    /**
-     * Check if the current user can perform any activity for
-     * android.media.action.IMAGE_CAPTURE action.
-     */
-    static boolean canTakePhoto(Context context) {
-        return context.getPackageManager().queryIntentActivities(
-                new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
-                PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
-    }
-
-    /**
-     * Check if the current user can perform any activity for
-     * android.intent.action.GET_CONTENT action for images.
-     */
-    static boolean canChoosePhoto(Context context) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
-    }
-
-    /**
-     * Check if the current user can perform any activity for
-     * com.android.camera.action.CROP action for images.
-     */
-    static boolean canCropPhoto(Context context) {
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setType("image/*");
-        return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
-    }
-
-}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8bfac91..50cb5de 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.users;
 
-import static android.os.Process.myUserHandle;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.Dialog;
@@ -39,10 +37,12 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.ContactsContract;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -73,6 +73,8 @@
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.drawable.CircleFramedDrawable;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.users.EditUserInfoController;
+import com.android.settingslib.users.UserCreatingDialog;
 import com.android.settingslib.utils.ThreadUtils;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -83,7 +85,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Random;
 
 /**
  * Screen that manages the list of users on the device.
@@ -165,9 +166,11 @@
     private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
 
     private MultiUserSwitchBarController mSwitchBarController;
-    private EditUserInfoController mEditUserInfoController = new EditUserInfoController();
+    private EditUserInfoController mEditUserInfoController =
+            new EditUserInfoController(Utils.FILE_PROVIDER_AUTHORITY);
     private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
     private MultiUserFooterPreferenceController mMultiUserFooterPreferenceController;
+    private UserCreatingDialog mUserCreatingDialog;
 
     private CharSequence mPendingUserName;
     private Drawable mPendingUserIcon;
@@ -175,6 +178,8 @@
     // A place to cache the generated default avatar
     private Drawable mDefaultIconDrawable;
 
+    // TODO:   Replace current Handler solution to something that doesn't leak memory and works
+    // TODO:   during a configuration change
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -321,9 +326,9 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
         mEditUserInfoController.onSaveInstanceState(outState);
         outState.putInt(SAVE_REMOVING_USER, mRemovingUserId);
+        super.onSaveInstanceState(outState);
     }
 
     @Override
@@ -471,11 +476,22 @@
     }
 
     private void onUserCreated(int userId) {
+        hideUserCreatingDialog();
+        // prevent crash when config changes during user creation
+        if (getContext() == null) {
+            return;
+        }
         mAddingUser = false;
         UserInfo userInfo = mUserManager.getUserInfo(userId);
         openUserDetails(userInfo, true);
     }
 
+    private void hideUserCreatingDialog() {
+        if (mUserCreatingDialog != null && mUserCreatingDialog.isShowing()) {
+            mUserCreatingDialog.dismiss();
+        }
+    }
+
     private void openUserDetails(UserInfo userInfo, boolean newUser) {
         Bundle extras = new Bundle();
         extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
@@ -605,94 +621,82 @@
                 return dlg;
             }
             case DIALOG_USER_PROFILE_EDITOR: {
-                UserHandle user = myUserHandle();
-                UserInfo info = mUserManager.getUserInfo(user.getIdentifier());
-                return mEditUserInfoController.createDialog(
-                        this,
-                        Utils.getUserIcon(getPrefContext(), mUserManager, info),
-                        info.name,
-                        getString(com.android.settingslib.R.string.profile_info_settings_title),
-                        new EditUserInfoController.OnContentChangedCallback() {
-                            @Override
-                            public void onPhotoChanged(UserHandle user, Drawable photo) {
-                                ThreadUtils.postOnBackgroundThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        mUserManager.setUserIcon(user.getIdentifier(),
-                                                UserIcons.convertToBitmap(photo));
-                                    }
-                                });
-                                mMePreference.setIcon(photo);
-                            }
-
-                            @Override
-                            public void onLabelChanged(UserHandle user, CharSequence label) {
-                                mMePreference.setTitle(label.toString());
-                                mUserManager.setUserName(user.getIdentifier(), label.toString());
-                            }
-                        },
-                        user,
-                        null);
+                return buildEditCurrentUserDialog();
             }
             case DIALOG_USER_PROFILE_EDITOR_ADD_USER: {
                 synchronized (mUserLock) {
-                    mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
-                            new Random(System.currentTimeMillis()).nextInt(8), false);
                     mPendingUserName = getString(
                             com.android.settingslib.R.string.user_new_user_name);
+                    mPendingUserIcon = null;
                 }
-                return buildAddUserProfileEditorDialog(USER_TYPE_USER);
+                return buildAddUserDialog(USER_TYPE_USER);
             }
             case DIALOG_USER_PROFILE_EDITOR_ADD_RESTRICTED_PROFILE: {
                 synchronized (mUserLock) {
-                    mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
-                            new Random(System.currentTimeMillis()).nextInt(8), false);
                     mPendingUserName = getString(
                             com.android.settingslib.R.string.user_new_profile_name);
+                    mPendingUserIcon = null;
                 }
-                return buildAddUserProfileEditorDialog(USER_TYPE_RESTRICTED_PROFILE);
+                return buildAddUserDialog(USER_TYPE_RESTRICTED_PROFILE);
             }
             default:
                 return null;
         }
     }
 
-    private Dialog buildAddUserProfileEditorDialog(int userType) {
+    private Dialog buildEditCurrentUserDialog() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return null;
+        }
+
+        UserInfo user = mUserManager.getUserInfo(Process.myUserHandle().getIdentifier());
+        Drawable userIcon = Utils.getUserIcon(activity, mUserManager, user);
+
+        return mEditUserInfoController.createDialog(
+                activity,
+                this::startActivityForResult,
+                userIcon,
+                user.name,
+                getString(com.android.settingslib.R.string.profile_info_settings_title),
+                (newUserName, newUserIcon) -> {
+                    if (newUserIcon != userIcon) {
+                        ThreadUtils.postOnBackgroundThread(() ->
+                                mUserManager.setUserIcon(user.id,
+                                        UserIcons.convertToBitmap(newUserIcon)));
+                        mMePreference.setIcon(newUserIcon);
+                    }
+
+                    if (!TextUtils.isEmpty(newUserName) && !newUserName.equals(user.name)) {
+                        mMePreference.setTitle(newUserName);
+                        mUserManager.setUserName(user.id, newUserName);
+                    }
+                }, null);
+    }
+
+    private Dialog buildAddUserDialog(int userType) {
         Dialog d;
         synchronized (mUserLock) {
             d = mEditUserInfoController.createDialog(
-                    this,
-                    mPendingUserIcon,
-                    mPendingUserName,
+                    getActivity(),
+                    this::startActivityForResult,
+                    null,
+                    mPendingUserName.toString(),
                     getString(userType == USER_TYPE_USER
                             ? com.android.settingslib.R.string.user_info_settings_title
                             : com.android.settingslib.R.string.profile_info_settings_title),
-                    new EditUserInfoController.OnContentChangedCallback() {
-                        @Override
-                        public void onPhotoChanged(UserHandle user, Drawable photo) {
-                            mPendingUserIcon = photo;
-                        }
-
-                        @Override
-                        public void onLabelChanged(UserHandle user, CharSequence label) {
-                            mPendingUserName = label;
-                        }
+                    (userName, userIcon) -> {
+                        mPendingUserIcon = userIcon;
+                        mPendingUserName = userName;
+                        addUserNow(userType);
                     },
-                    myUserHandle(),
-                    new EditUserInfoController.OnDialogCompleteCallback() {
-                        @Override
-                        public void onPositive() {
-                            addUserNow(userType);
+                    () -> {
+                        synchronized (mUserLock) {
+                            mPendingUserIcon = null;
+                            mPendingUserName = null;
                         }
-
-                        @Override
-                        public void onNegativeOrCancel() {
-                            synchronized (mUserLock) {
-                                mPendingUserIcon = null;
-                                mPendingUserName = null;
-                            }
-                        }
-                    });
+                    }
+            );
         }
         return d;
     }
@@ -759,6 +763,9 @@
                     : (mPendingUserName != null ? mPendingUserName.toString()
                             : getString(R.string.user_new_profile_name));
         }
+
+        mUserCreatingDialog = new UserCreatingDialog(getActivity());
+        mUserCreatingDialog.show();
         ThreadUtils.postOnBackgroundThread(new Runnable() {
             @Override
             public void run() {
@@ -781,13 +788,15 @@
                         mAddingUser = false;
                         mPendingUserIcon = null;
                         mPendingUserName = null;
+                        ThreadUtils.postOnMainThread(() -> hideUserCreatingDialog());
                         return;
                     }
 
-                    if (mPendingUserIcon != null) {
-                        mUserManager.setUserIcon(user.id,
-                                UserIcons.convertToBitmap(mPendingUserIcon));
+                    Drawable newUserIcon = mPendingUserIcon;
+                    if (newUserIcon == null) {
+                        newUserIcon = UserIcons.getDefaultUserIcon(getResources(), user.id, false);
                     }
+                    mUserManager.setUserIcon(user.id, UserIcons.convertToBitmap(newUserIcon));
 
                     if (userType == USER_TYPE_USER) {
                         mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index ab0af7c..5e20fd5 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
-govenliu@google.com
+andychou@google.com
 arcwang@google.com
-tmfang@google.com
+goldmanj@google.com
+wengsu@google.com
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 9676f58..a2b143e 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -738,10 +738,7 @@
         }
 
         mMacAddressPref.setVisible(true);
-
-        mMacAddressPref.setTitle((mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC)
-                ? R.string.wifi_advanced_randomized_mac_address_title
-                : R.string.wifi_advanced_device_mac_address_title);
+        mMacAddressPref.setTitle(getMacAddressTitle());
 
         if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
             mMacAddressPref.setSummary(R.string.device_info_not_available);
@@ -750,6 +747,15 @@
         }
     }
 
+    private int getMacAddressTitle() {
+        if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
+            return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED
+                    ? R.string.wifi_advanced_randomized_mac_address_title
+                    : R.string.wifi_advanced_randomized_mac_address_disconnected_title;
+        }
+        return R.string.wifi_advanced_device_mac_address_title;
+    }
+
     private void updatePreference(Preference pref, String detailText) {
         if (!TextUtils.isEmpty(detailText)) {
             pref.setSummary(detailText);
diff --git a/tests/robotests/assets/exempt_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider
index 80e179a..97fe120 100644
--- a/tests/robotests/assets/exempt_not_implementing_index_provider
+++ b/tests/robotests/assets/exempt_not_implementing_index_provider
@@ -54,8 +54,8 @@
 com.android.settings.inputmethod.SpellCheckersSettings
 com.android.settings.location.LocationPersonalSettings
 com.android.settings.location.LocationWorkProfileSettings
-com.android.settings.network.ApnEditor
-com.android.settings.network.ApnSettings
+com.android.settings.network.apn.ApnEditor
+com.android.settings.network.apn.ApnSettings
 com.android.settings.network.telephony.NetworkSelectSettings
 com.android.settings.notification.app.AppNotificationSettings
 com.android.settings.notification.app.ChannelNotificationSettings
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index e914b01..e251669 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -35,6 +35,6 @@
         // Nightmode is currently hidden
         preferenceKeys.remove("night_mode");
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 78a5ee3..3418a40 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -46,6 +46,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
index c28ffc4..a8f42c2 100644
--- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
@@ -94,6 +94,6 @@
 
         final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
         assertThat(updatedShortcuts).hasSize(1);
-        assertThat(updatedShortcuts.get(0)).isSameAs(info);
+        assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 329c23d..c2cc609 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -99,7 +99,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java
new file mode 100644
index 0000000..c3dd7b5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.drawable.AnimatedImageDrawable;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link AnimatedImagePreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class AnimatedImagePreferenceTest {
+    private Uri mImageUri;
+    private View mRootView;
+    private PreferenceViewHolder mViewHolder;
+    private AnimatedImagePreference mAnimatedImagePreference;
+
+    @Spy
+    private ImageView mImageView;
+
+    @Mock
+    private AnimatedImageDrawable mAnimatedImageDrawable;
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+
+        final Context context = RuntimeEnvironment.application;
+        final LayoutInflater inflater = LayoutInflater.from(context);
+        mRootView = spy(inflater.inflate(R.layout.preference_animated_image, /* root= */ null));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+        mImageView = spy(new ImageView(context));
+
+        mAnimatedImagePreference = new AnimatedImagePreference(context);
+        mImageUri = new Uri.Builder().build();
+    }
+
+    @Test
+    public void readImageUri_animatedImage_startAnimation() {
+        doReturn(mImageView).when(mRootView).findViewById(R.id.animated_img);
+        doReturn(mAnimatedImageDrawable).when(mImageView).getDrawable();
+
+        mAnimatedImagePreference.setImageUri(mImageUri);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        verify(mAnimatedImageDrawable).start();
+    }
+
+    @Test
+    public void setImageUri_viewNotExist_setFail() {
+        doReturn(null).when(mRootView).findViewById(R.id.animated_img);
+
+        mAnimatedImagePreference.setImageUri(mImageUri);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView, never()).setImageURI(mImageUri);
+    }
+
+    @Test
+    public void setMaxHeight_success() {
+        final int maxHeight = 100;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.animated_img);
+
+        mAnimatedImagePreference.setMaxHeight(maxHeight);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        assertThat(mImageView.getMaxHeight()).isEqualTo(maxHeight);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
new file mode 100644
index 0000000..d967b98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link ColorPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class ColorPreferenceTest {
+
+    private Context mContext;
+    private static final int COLOR_TRANSPARENT_VALUE = 0;
+    private static final int COLOR_WHITE_VALUE = 0xFFFFFFFF;
+    private static final int COLOR_BLACK_VALUE = 0xFF000000;
+    private static final String COLOR_TRANSPARENT = "TRANSPARENT";
+    private static final String COLOR_WHITE = "WHITE";
+    private static final String COLOR_BLACK = "BLACK";
+    private final int[] mColorValues =
+            {COLOR_TRANSPARENT_VALUE, COLOR_WHITE_VALUE, COLOR_BLACK_VALUE};
+    private final String[] mColorTitles = {COLOR_TRANSPARENT, COLOR_WHITE, COLOR_BLACK};
+    private View mRootView;
+    private ImageView mImageView;
+    private TextView mTextView;
+    private ColorPreference mColorPreference;
+    private PreferenceViewHolder mViewHolder;
+
+    @Before
+    public void init() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mRootView = spy(new View(mContext));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+        mImageView = spy(new ImageView(mContext));
+        mTextView = spy(new TextView(mContext));
+
+        final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        mColorPreference = new ColorPreference(mContext, attributeSet);
+    }
+
+    @Test
+    public void setPreviewEnabled_enabled_shouldSetCustomLayout() {
+        mColorPreference.setPreviewEnabled(true);
+
+        assertThat(mColorPreference.getWidgetLayoutResource()).isEqualTo(R.layout.preference_color);
+    }
+
+    @Test
+    public void setPreviewEnabled_disabled_shouldSetInvalidId() {
+        mColorPreference.setPreviewEnabled(false);
+
+        assertThat(mColorPreference.getWidgetLayoutResource()).isEqualTo(0);
+    }
+
+    @Test
+    public void setTitles_titlesExist_returnTitle() {
+        mColorPreference.setTitles(mColorTitles);
+
+        assertThat(mColorPreference.getTitleAt(/* index= */ 0)).isEqualTo(mColorTitles[0]);
+        assertThat(mColorPreference.getTitleAt(/* index= */ 1)).isEqualTo(mColorTitles[1]);
+        assertThat(mColorPreference.getTitleAt(/* index= */ 2)).isEqualTo(mColorTitles[2]);
+    }
+
+    @Test
+    public void setTitles_noTitle_returnRGBText() {
+        final int testIndex = 0;
+        mColorPreference.setValues(mColorValues);
+        final ListDialogPreference listDialogPreference = (ListDialogPreference) mColorPreference;
+        final int value = listDialogPreference.getValueAt(testIndex);
+        final int r = Color.red(value);
+        final int g = Color.green(value);
+        final int b = Color.blue(value);
+        final String rgbText = mContext.getString(R.string.color_custom, r, g, b);
+
+        mColorPreference.setTitles(null);
+        final CharSequence title = mColorPreference.getTitleAt(testIndex);
+
+        assertThat(title).isEqualTo(rgbText);
+    }
+
+    @Test
+    public void onBindViewHolder_enabled_transparent_matchBackgroundResource() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+
+        mColorPreference.setEnabled(true);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_TRANSPARENT_VALUE);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setBackgroundResource(R.drawable.transparency_tileable);
+    }
+
+    @Test
+    public void onBindViewHolder_enabled_titlesExist_matchDescription() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+
+        mColorPreference.setEnabled(true);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_WHITE_VALUE);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setContentDescription(COLOR_WHITE);
+    }
+
+    @Test
+    public void onBindViewHolder_disabled_matchAlpha() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_WHITE_VALUE);
+
+        mColorPreference.setEnabled(false);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setAlpha(0.2f);
+    }
+
+    @Test
+    public void onBindListItem_transparent_matchBackgroundResource() {
+        final int colorTransparentIndex = 0;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, colorTransparentIndex);
+
+        verify(mImageView).setBackgroundResource(R.drawable.transparency_tileable);
+    }
+
+    @Test
+    public void onBindListItem_colorDrawable_matchColor() {
+        final int testIndex = 0;
+        final ColorDrawable colorDrawable = spy(new ColorDrawable());
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(colorDrawable).when(mImageView).getDrawable();
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, testIndex);
+        final int argb = mColorPreference.getValueAt(testIndex);
+        final int alpha = Color.alpha(argb);
+
+        verify(colorDrawable).setColor(alpha);
+    }
+
+    @Test
+    public void onBindListItem_colorDrawable_matchSummary() {
+        final int testIndex = 0;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, /* index= */ testIndex);
+        final CharSequence title = mColorPreference.getTitleAt(testIndex);
+
+        verify(mTextView).setText(title);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java
new file mode 100644
index 0000000..27f0623
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link DividerAllowedBelowPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class DividerAllowedBelowPreferenceTest {
+    private final Context mContext = RuntimeEnvironment.application;
+    private PreferenceViewHolder mViewHolder;
+
+    @Before
+    public void setUp() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View rootView =
+                inflater.inflate(R.layout.preference, /* root= */ null);
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(rootView));
+    }
+
+    @Test
+    public void onBindViewHolder_dividerAllowedBelow() {
+        final DividerAllowedBelowPreference dividerAllowedBelowPreference =
+                new DividerAllowedBelowPreference(mContext);
+
+        dividerAllowedBelowPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedBelow(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java
new file mode 100644
index 0000000..d80a4e8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link DividerSwitchPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class DividerSwitchPreferenceTest {
+    private final Context mContext = RuntimeEnvironment.application;
+    private View mRootView;
+    private PreferenceViewHolder mViewHolder;
+    private DividerSwitchPreference mDividerSwitchPreference;
+
+    @Before
+    public void setUp() {
+        initRootView();
+        initPreference();
+    }
+
+    @Test
+    public void setDividerAllowedAbove_allowed_success() {
+        mDividerSwitchPreference.setDividerAllowedAbove(true);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedAbove(true);
+    }
+
+    @Test
+    public void setDividerAllowedBelow_allowed_success() {
+        mDividerSwitchPreference.setDividerAllowedBelow(true);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedBelow(true);
+    }
+
+    @Test
+    public void setSwitchVisibility_visible_success() {
+        final View view = spy(new View(mContext));
+        doReturn(view).when(mRootView).findViewById(android.R.id.widget_frame);
+
+        mDividerSwitchPreference.setSwitchVisibility(View.VISIBLE);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    private void initRootView() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        mRootView = spy(inflater.inflate(R.layout.preference_widget_switch, /* root= */ null));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+    }
+
+    private void initPreference() {
+        mDividerSwitchPreference = new DividerSwitchPreference(mContext);
+        mDividerSwitchPreference.setDividerAllowedAbove(false);
+        mDividerSwitchPreference.setDividerAllowedBelow(false);
+        mDividerSwitchPreference.setSwitchVisibility(View.INVISIBLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
new file mode 100644
index 0000000..9117d51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link EdgeTypePreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class EdgeTypePreferenceTest {
+
+    private Context mContext;
+    private View mRootView;
+    private TextView mSummaryView;
+    private SubtitleView mSubtitleView;
+    private EdgeTypePreference mEdgeTypePreference;
+
+    @Before
+    public void init() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mRootView = spy(new View(mContext));
+        mSummaryView = spy(new TextView(mContext));
+        mSubtitleView = spy(new SubtitleView(mContext));
+
+        final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        mEdgeTypePreference = spy(new EdgeTypePreference(mContext, attributeSet));
+        doReturn(mSubtitleView).when(mRootView).findViewById(R.id.preview);
+        doReturn(mSummaryView).when(mRootView).findViewById(R.id.summary);
+    }
+
+    @Test
+    public void shouldDisableDependents_edgeTypeNone_returnTrue() {
+        mEdgeTypePreference.setValue(CaptionStyle.EDGE_TYPE_NONE);
+        final boolean shouldDisableDependents =
+                mEdgeTypePreference.shouldDisableDependents();
+
+        assertThat(shouldDisableDependents).isTrue();
+    }
+
+    @Test
+    public void onBindListItem_initSubtitleView() {
+        final int testIndex = 0;
+        mEdgeTypePreference.onBindListItem(mRootView, testIndex);
+        final float density = mContext.getResources().getDisplayMetrics().density;
+        final int value = mEdgeTypePreference.getValueAt(testIndex);
+
+        verify(mSubtitleView).setForegroundColor(Color.WHITE);
+        verify(mSubtitleView).setBackgroundColor(Color.TRANSPARENT);
+        verify(mSubtitleView).setTextSize(32f * density);
+        verify(mSubtitleView).setEdgeType(value);
+        verify(mSubtitleView).setEdgeColor(Color.BLACK);
+    }
+
+    @Test
+    public void onBindListItem_setSummary() {
+        final int testIndex = 0;
+        mEdgeTypePreference.onBindListItem(mRootView, testIndex);
+        final CharSequence title = mEdgeTypePreference.getTitleAt(testIndex);
+
+        verify(mSummaryView).setText(title);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutTest.java b/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutTest.java
new file mode 100644
index 0000000..e7d0996
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Tests for {@link PreferredShortcut} */
+@RunWith(AndroidJUnit4.class)
+public class PreferredShortcutTest {
+
+    private static final String STUB_COMPONENT_NAME = new ComponentName("com.example",
+            "com.example.testActivity").flattenToString();
+    private static final int STUB_TYPE = 3;
+
+    @Test
+    public void fromString_matchMemberObject() {
+        final String preferredShortcutString = STUB_COMPONENT_NAME + ":" + STUB_TYPE;
+
+        final PreferredShortcut shortcut = PreferredShortcut.fromString(preferredShortcutString);
+
+        assertThat(shortcut.getComponentName()).isEqualTo(STUB_COMPONENT_NAME);
+        assertThat(shortcut.getType()).isEqualTo(STUB_TYPE);
+    }
+
+    @Test
+    public void toString_matchString() {
+        final PreferredShortcut shortcut = new PreferredShortcut(STUB_COMPONENT_NAME, STUB_TYPE);
+
+        final String preferredShortcutString = shortcut.toString();
+
+        assertThat(preferredShortcutString).isEqualTo(STUB_COMPONENT_NAME + ":" + STUB_TYPE);
+    }
+
+    @Test
+    public void assertSameObject() {
+        final String preferredShortcutString = STUB_COMPONENT_NAME + ":" + STUB_TYPE;
+        final PreferredShortcut targetShortcut = PreferredShortcut.fromString(
+                preferredShortcutString);
+
+        assertThat(targetShortcut).isEqualTo(new PreferredShortcut(STUB_COMPONENT_NAME, STUB_TYPE));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutsTest.java b/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutsTest.java
new file mode 100644
index 0000000..a694aa3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/PreferredShortcutsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link PreferredShortcuts} */
+@RunWith(RobolectricTestRunner.class)
+public class PreferredShortcutsTest {
+
+    private static final String PACKAGE_NAME_1 = "com.test1.example";
+    private static final String CLASS_NAME_1 = PACKAGE_NAME_1 + ".test1";
+    private static final ComponentName COMPONENT_NAME_1 = new ComponentName(PACKAGE_NAME_1,
+            CLASS_NAME_1);
+    private static final String PACKAGE_NAME_2 = "com.test2.example";
+    private static final String CLASS_NAME_2 = PACKAGE_NAME_2 + ".test2";
+    private static final ComponentName COMPONENT_NAME_2 = new ComponentName(PACKAGE_NAME_2,
+            CLASS_NAME_2);
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void retrieveUserShortcutType_fromSingleData_matchSavedType() {
+        final int type = 1;
+        final PreferredShortcut shortcut = new PreferredShortcut(COMPONENT_NAME_1.flattenToString(),
+                type);
+
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut);
+        final int retrieveType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                COMPONENT_NAME_1.flattenToString(), 0);
+
+        assertThat(retrieveType).isEqualTo(type);
+    }
+
+    @Test
+    public void retrieveUserShortcutType_fromMultiData_matchSavedType() {
+        final int type1 = 1;
+        final int type2 = 2;
+        final PreferredShortcut shortcut1 = new PreferredShortcut(
+                COMPONENT_NAME_1.flattenToString(), type1);
+        final PreferredShortcut shortcut2 = new PreferredShortcut(
+                COMPONENT_NAME_2.flattenToString(), type2);
+
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut1);
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut2);
+        final int retrieveType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                COMPONENT_NAME_1.flattenToString(), 0);
+
+        assertThat(retrieveType).isEqualTo(type1);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 3df9c04..9a157fe 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,100 +16,77 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
+
 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.verify;
+import static org.mockito.Mockito.when;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.XmlRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.ToggleFeaturePreferenceFragment.AccessibilityUserShortcutType;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+/** Tests for {@link ToggleFeaturePreferenceFragment} */
 @RunWith(RobolectricTestRunner.class)
 public class ToggleFeaturePreferenceFragmentTest {
 
-    private ToggleFeaturePreferenceFragmentTestable mFragment;
+    private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
+    private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
+    private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
+            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
 
-    private static final String TEST_SERVICE_KEY_1 = "abc:111";
-    private static final String TEST_SERVICE_KEY_2 = "mno:222";
-    private static final String TEST_SERVICE_KEY_3 = "xyz:333";
+    private static final String SOFTWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
+    private static final String HARDWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
 
-    private static final String TEST_SERVICE_NAME_1 = "abc";
-    private static final int TEST_SERVICE_VALUE_1 = 111;
+    private TestToggleFeaturePreferenceFragment mFragment;
+    private Context mContext = ApplicationProvider.getApplicationContext();
 
-    @Test
-    public void a11yUserShortcutType_setConcatString_shouldReturnTargetValue() {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                TEST_SERVICE_KEY_1);
+    @Mock
+    private PreferenceManager mPreferenceManager;
 
-        assertThat(shortcut.getComponentName()).isEqualTo(TEST_SERVICE_NAME_1);
-        assertThat(shortcut.getType()).isEqualTo(TEST_SERVICE_VALUE_1);
-    }
+    @Before
+    public void setUpTestFragment() {
+        MockitoAnnotations.initMocks(this);
 
-    @Test
-    public void a11yUserShortcutType_shouldUpdateConcatString() {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                TEST_SERVICE_KEY_2);
-
-        shortcut.setComponentName(TEST_SERVICE_NAME_1);
-        shortcut.setType(TEST_SERVICE_VALUE_1);
-
-        assertThat(shortcut.flattenToString()).isEqualTo(TEST_SERVICE_KEY_1);
-    }
-
-    @Test
-    public void stringSet_convertA11yPreferredShortcut_shouldRemoveTarget() {
-        Set<String> mySet = new HashSet<>();
-        mySet.add(TEST_SERVICE_KEY_1);
-        mySet.add(TEST_SERVICE_KEY_2);
-        mySet.add(TEST_SERVICE_KEY_3);
-
-        final Set<String> filtered = mySet.stream()
-                .filter(str -> str.contains(TEST_SERVICE_NAME_1))
-                .collect(Collectors.toSet());
-        mySet.removeAll(filtered);
-
-        assertThat(mySet).doesNotContain(TEST_SERVICE_KEY_1);
-        assertThat(mySet).hasSize(/* expectedSize= */2);
-    }
-
-    @Test
-    public void stringSet_convertA11yUserShortcutType_shouldReturnPreferredShortcut() {
-        Set<String> mySet = new HashSet<>();
-        mySet.add(TEST_SERVICE_KEY_1);
-        mySet.add(TEST_SERVICE_KEY_2);
-        mySet.add(TEST_SERVICE_KEY_3);
-
-        final Set<String> filtered = mySet.stream()
-                .filter(str -> str.contains(TEST_SERVICE_NAME_1))
-                .collect(Collectors.toSet());
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        final int type = shortcut.getType();
-        assertThat(type).isEqualTo(TEST_SERVICE_VALUE_1);
+        mFragment = spy(new TestToggleFeaturePreferenceFragment());
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mContext);
+        doReturn(null).when(mFragment).getPreferenceScreen();
     }
 
     @Test
     public void createFragment_shouldOnlyAddPreferencesOnce() {
-        mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
         FragmentController.setupFragment(mFragment, FragmentActivity.class,
                 /* containerViewId= */ 0, /* bundle= */null);
 
@@ -117,7 +94,73 @@
         verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
     }
 
-    public static class ToggleFeaturePreferenceFragmentTestable
+    @Test
+    public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+
+        mFragment.updateShortcutPreferenceData();
+
+        // Compare to default UserShortcutType
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSettings_assignToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
+        mFragment.updateShortcutPreferenceData();
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        final PreferredShortcut hardwareShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+
+        putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
+        mFragment.updateShortcutPreferenceData();
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    @Config(shadows = ShadowFragment.class)
+    public void restoreValueFromSavedInstanceState_assignToVariable() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final String dialogTitle = "title";
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, dialogTitle, this::callEmptyOnClicked);
+        final Bundle savedInstanceState = new Bundle();
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+
+        savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+        mFragment.onCreate(savedInstanceState);
+        mFragment.initializeDialogCheckBox(dialog);
+        mFragment.updateUserShortcutType(true);
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+
+    }
+
+    private void putStringIntoSettings(String key, String componentName) {
+        Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
+    }
+
+    private void putUserShortcutTypeIntoSharedPreference(Context context,
+            PreferredShortcut shortcut) {
+        PreferredShortcuts.saveUserShortcutType(context, shortcut);
+    }
+
+    private void callEmptyOnClicked(DialogInterface dialog, int which) {}
+
+    public static class TestToggleFeaturePreferenceFragment
             extends ToggleFeaturePreferenceFragment {
 
         @Override
@@ -146,13 +189,24 @@
         }
 
         @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            // do nothing
+        }
+
+        @Override
+        public void onDestroyView() {
+            // do nothing
+        }
+
+        @Override
         public void addPreferencesFromResource(@XmlRes int preferencesResId) {
             // do nothing
         }
 
         @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            // do nothing
+        protected void updateShortcutPreference() {
+            // UI related function, do nothing in tests
         }
+
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 10a4d85..5c0cb6d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -19,40 +19,78 @@
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
 import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.XmlRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class ToggleScreenMagnificationPreferenceFragmentTest {
 
-    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
-    private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
-            DUMMY_CLASS_NAME);
+    private static final String PLACEHOLDER_PACKAGE_NAME = "com.mock.example";
+    private static final String PLACEHOLDER_CLASS_NAME =
+            PLACEHOLDER_PACKAGE_NAME + ".mock_a11y_service";
+    private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
+            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+
     private static final String SOFTWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
     private static final String HARDWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
     private static final String TRIPLETAP_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
+
     private static final String MAGNIFICATION_CONTROLLER_NAME =
             "com.android.server.accessibility.MagnificationController";
 
-    private Context mContext;
+    private TestToggleScreenMagnificationPreferenceFragment mFragment;
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private FragmentActivity mActivity;
 
     @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
+    public void setUpTestFragment() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestToggleScreenMagnificationPreferenceFragment());
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mContext);
+        doReturn(null).when(mFragment).getPreferenceScreen();
+        doReturn(mActivity).when(mFragment).getActivity();
     }
 
     @Test
@@ -78,14 +116,13 @@
 
     @Test
     public void optInAllValuesToSettings_existOtherValue_optInValue_haveMatchString() {
-        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
 
         ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
                 UserShortcutType.SOFTWARE);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
-
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
     }
 
     @Test
@@ -107,27 +144,81 @@
     @Test
     public void optOutValueFromSettings_existOtherValue_optOutValue_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY,
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
         putStringIntoSettings(HARDWARE_SHORTCUT_KEY,
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
         int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
 
         ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
                 mContext, shortcutTypes);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString());
+                PLACEHOLDER_COMPONENT_NAME.flattenToString());
         assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString());
+                PLACEHOLDER_COMPONENT_NAME.flattenToString());
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
+        mFragment.updateShortcutPreferenceData();
+
+        // Compare to default UserShortcutType
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSettings_assignToVariable() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        setMagnificationTripleTapEnabled(/* enabled= */ true);
+        mFragment.updateShortcutPreferenceData();
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
+        final PreferredShortcut tripleTapShortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+
+        putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
+        mFragment.updateShortcutPreferenceData();
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    @Config(shadows = ShadowFragment.class)
+    public void restoreValueFromSavedInstanceState_assignToVariable() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final String dialogTitle = "title";
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, dialogTitle, this::callEmptyOnClicked);
+        final Bundle savedInstanceState = new Bundle();
+
+        savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+        mFragment.onCreate(savedInstanceState);
+        mFragment.initializeDialogCheckBox(dialog);
+        mFragment.updateUserShortcutType(true);
+
+        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+
     }
 
     private void putStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
 
+    private void putUserShortcutTypeIntoSharedPreference(Context context,
+            PreferredShortcut shortcut) {
+        PreferredShortcuts.saveUserShortcutType(context, shortcut);
+    }
+
     private void setMagnificationTripleTapEnabled(boolean enabled) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? ON : OFF);
+        Settings.Secure.putInt(mContext.getContentResolver(), TRIPLETAP_SHORTCUT_KEY,
+                enabled ? ON : OFF);
     }
 
     private String getStringFromSettings(String key) {
@@ -135,7 +226,57 @@
     }
 
     private boolean getMagnificationTripleTapStatus() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
+        return Settings.Secure.getInt(mContext.getContentResolver(), TRIPLETAP_SHORTCUT_KEY, OFF)
+                == ON;
+    }
+
+    private void callEmptyOnClicked(DialogInterface dialog, int which) {}
+
+    public static class TestToggleScreenMagnificationPreferenceFragment
+            extends ToggleScreenMagnificationPreferenceFragment {
+        @Override
+        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        int getUserShortcutTypes() {
+            return 0;
+        }
+
+        @Override
+        public int getPreferenceScreenResId() {
+            return R.xml.placeholder_prefs;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return mock(View.class);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            // do nothing
+        }
+
+        @Override
+        public void onDestroyView() {
+            // do nothing
+        }
+
+        @Override
+        public void addPreferencesFromResource(@XmlRes int preferencesResId) {
+            // do nothing
+        }
+
+        @Override
+        protected void updateShortcutPreference() {
+            // UI related function, do nothing in tests
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 1651cb6..7044389 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -280,7 +280,7 @@
 
         final List<String> expectedPackages = Arrays.asList(testDialer, testSms,
                 testLocationHistory);
-        assertThat(keepEnabledPackages).containsAllIn(expectedPackages);
+        assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index a5ac209..9a65dc8 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -420,7 +420,7 @@
         mController.forceStopPackage(PACKAGE_NAME);
 
         verify(mAm).forceStopPackage(PACKAGE_NAME);
-        assertThat(mController.mAppEntry).isSameAs(appEntry);
+        assertThat(mController.mAppEntry).isSameInstanceAs(appEntry);
         verify(mController).updateForceStopButton();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
index 002a0bc..10c2675 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
@@ -19,17 +19,11 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.ActivityManager;
-import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ApplicationInfo;
@@ -61,10 +55,6 @@
     @Mock
     private UserManager mUserManager;
     @Mock
-    private ActivityManager mActivityManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
     private RestrictedSwitchPreference mSwitchPref;
     @Mock
     private RestrictedPreferenceHelper mHelper;
@@ -79,47 +69,10 @@
 
         mFragment = new ExternalSourcesDetails();
         ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
-        ReflectionHelpers.setField(mFragment, "mActivityManager", mActivityManager);
-        ReflectionHelpers.setField(mFragment, "mAppOpsManager", mAppOpsManager);
         ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
     }
 
     @Test
-    public void setCanInstallApps_false_shouldKillNonCoreUid() {
-        int mockUid = 23456;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        assertThat(UserHandle.isCore(mockUid)).isFalse();
-        mFragment.setCanInstallApps(false);
-        verify(mActivityManager).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
-    public void setCanInstallApps_false_shouldNotKillCoreUid() {
-        int mockUid = 1234;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        assertThat(UserHandle.isCore(mockUid)).isTrue();
-        mFragment.setCanInstallApps(false);
-        verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
-    public void setCanInstallApps_true_shouldNotKillUid() {
-        int mockUid = 23456;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        mFragment.setCanInstallApps(true);
-        verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
     public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
         mFragment.refreshUi();
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 78ab49b..465e735 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -92,7 +93,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -107,12 +108,12 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
 
         // Should only start one next activity
-        assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
+        assertWithMessage("Next activity 2").that(shadowActivity.getNextStartedActivityForResult())
                 .isNull();
     }
 
@@ -129,7 +130,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -140,7 +141,7 @@
         layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        assertThat(shadowActivity.getResultCode()).named("result code")
+        assertWithMessage("result code").that(shadowActivity.getResultCode())
                 .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 9fa6099..ea5511d 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -70,12 +71,13 @@
         final Button cancelButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
         assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
-        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Cancel visible").that(cancelButton.getVisibility())
+                .isEqualTo(View.VISIBLE);
         cancelButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(Activity.RESULT_CANCELED);
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
index 57a56fc..e238a0e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -19,6 +19,7 @@
 import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -76,7 +77,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -91,7 +92,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -162,4 +163,4 @@
         assertThat(application.getPackageManager().getComponentEnabledSetting(
                 mComponentName)).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 794560c..25780f7 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -26,6 +27,7 @@
 import android.hardware.biometrics.SensorProperties;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.view.View;
 import android.widget.Button;
 
@@ -74,12 +76,13 @@
         Shadows.shadowOf(application.getPackageManager())
             .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
 
-        final FingerprintSensorProperties prop = new FingerprintSensorProperties(0 /* sensorId */,
+        final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
+                0 /* sensorId */,
                 SensorProperties.STRENGTH_STRONG,
                 5 /* maxEnrollmentsPerUser */,
                 FingerprintSensorProperties.TYPE_REAR,
                 true /* resetLockoutRequiresHardwareAuthToken */);
-        final ArrayList<FingerprintSensorProperties> props = new ArrayList<>();
+        final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
         props.add(prop);
         ShadowFingerprintManager.setSensorProperties(props);
 
@@ -104,12 +107,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(SetupSkipDialog.RESULT_SKIP);
     }
 
@@ -123,12 +126,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 5c4e03d..4d2ad36 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -42,6 +42,7 @@
 import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.Before;
@@ -285,6 +286,68 @@
         verify(mBitmap).recycle();
     }
 
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showView() {
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_middle));
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+                View.VISIBLE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+                View.VISIBLE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+                View.VISIBLE);
+    }
+
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsNotAvailable_notShowView() {
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_middle));
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+                View.GONE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+                View.GONE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+                View.GONE);
+    }
+
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showCorrectValue() {
+        final String leftBatteryPrediction =
+                StringUtil.formatElapsedTime(mContext, 12000000, false).toString();
+        final String rightBatteryPrediction =
+                StringUtil.formatElapsedTime(mContext, 1200000, false).toString();
+
+        mController.showBatteryPredictionIfNecessary(1, 12000000,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(1, 1200000,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_left),
+                leftBatteryPrediction);
+        assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_right),
+                rightBatteryPrediction);
+    }
+
+    private void assertBatteryPredictionVisible(LinearLayout linearLayout, int visible) {
+        final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+        assertThat(textView.getVisibility()).isEqualTo(visible);
+    }
+
+    private void assertBatteryPrediction(LinearLayout linearLayout, String prediction) {
+        final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+        assertThat(textView.getText().toString()).isEqualTo(prediction);
+    }
+
     private void assertBatteryLevel(LinearLayout linearLayout, int batteryLevel) {
         final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
         assertThat(textView.getText().toString()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
index 4e5897d..b816a18 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
@@ -181,4 +181,24 @@
 
         assertThat(usbBackend.areFunctionsSupported(UsbManager.FUNCTION_MTP)).isTrue();
     }
+
+    @Test
+    public void areFunctionsDisallowedByNonAdminUser_isAdminUser_returnFalse() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+
+        final UsbBackend usbBackend = new UsbBackend(mContext, mUserManager);
+
+        assertThat(usbBackend.areFunctionsDisallowedByNonAdminUser(
+                UsbManager.FUNCTION_RNDIS)).isFalse();
+    }
+
+    @Test
+    public void areFunctionsDisallowedByNonAdminUser_isNotAdminUser_returnTrue() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+
+        final UsbBackend usbBackend = new UsbBackend(mContext, mUserManager);
+
+        assertThat(usbBackend.areFunctionsDisallowedByNonAdminUser(
+                UsbManager.FUNCTION_RNDIS)).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 149df6e..9e31ca1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -264,6 +264,18 @@
     }
 
     @Test
+    public void onRadioButtonClicked_functionMtp_inAccessoryMode_doNothing() {
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
+        doReturn(UsbManager.FUNCTION_ACCESSORY).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_ACCESSORY;
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+                UsbManager.FUNCTION_ACCESSORY);
+    }
+
+    @Test
     public void onRadioButtonClicked_clickSameButton_doNothing() {
         mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
         doReturn(UsbManager.FUNCTION_PTP).when(mUsbBackend).getCurrentFunctions();
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 9b1c411..a6bd865 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -47,6 +47,6 @@
         MetricsFeatureProvider feature2 =
                 FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
-        assertThat(feature1).isSameAs(feature2);
+        assertThat(feature1).isSameInstanceAs(feature2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
index 64eaad5..a0db866 100644
--- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
@@ -67,7 +67,7 @@
 
     @Test
     public void getInstance_shouldBeSingleton() {
-        assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext));
+        assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
     }
 
     @Test
@@ -147,9 +147,9 @@
         mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
 
         // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile3);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile2);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile2);
     }
 
     @Test
@@ -170,9 +170,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile3);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
     }
 
     @Test
@@ -192,9 +192,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
     }
 
     @Test
@@ -217,10 +217,10 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
-        assertThat(category.getTile(3)).isSameAs(tile4);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(3)).isSameInstanceAs(tile4);
     }
 
     @Test
@@ -242,9 +242,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is internal first, follow by package name ordering
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile3);
-        assertThat(category.getTile(2)).isSameAs(tile1);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile1);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 4b53ed1..efc7263 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -129,7 +129,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller).isSameAs(retrievedController);
+        assertThat(controller).isSameInstanceAs(retrievedController);
     }
 
     @Test
@@ -142,7 +142,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller1).isSameAs(retrievedController);
+        assertThat(controller1).isSameInstanceAs(retrievedController);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 1acbcda..d21aa04 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -54,7 +54,7 @@
         when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
         when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
         assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
-                .isSameAs(countryTimeZones);
+                .isSameInstanceAs(countryTimeZones);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 79a19b5..89f51a7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -533,7 +533,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.SCREEN);
 
-        assertThat(sipper).isSameAs(mScreenBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
     }
 
     @Test
@@ -541,7 +541,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.APP);
 
-        assertThat(sipper).isSameAs(mNormalBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 7839e1a..a94ca93 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -232,7 +232,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
index 5a6ca86..0cc6b43 100644
--- a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
@@ -22,6 +22,10 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -45,4 +49,17 @@
     public void shouldForceRoundedIcon_true() {
         assertThat(mSettings.shouldForceRoundedIcon()).isTrue();
     }
+
+    @Test
+    public void getPreferenceScreenResId_silkyHomeDisabled_defaultSettings() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.top_level_settings);
+    }
+
+    @Test
+    public void getPreferenceScreenResId_silkyHomeEnabled_groupedSettings() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(
+                R.xml.top_level_settings_grouped);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index a6a362e..5a92aa2 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -133,7 +133,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
@@ -151,7 +151,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index 28620e9..68848af 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -23,6 +23,8 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -54,6 +56,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -203,31 +206,45 @@
     }
 
     @Test
-    public void getMediaOutputSliceIntent_withActiveLocalMedia_verifyIntentExtra() {
+    public void onNotifyChange_withActiveLocalMedia_verifyIntentExtra() {
         when(mMediaController.getSessionToken()).thenReturn(mToken);
         when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
         doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
                 .getActiveLocalMediaController();
-        final Intent intent = mMediaOutputIndicatorSlice.getMediaOutputSliceIntent();
+        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+
+        mMediaOutputIndicatorSlice.onNotifyChange(null);
+        verify(mContext, times(2)).sendBroadcast(argument.capture());
+        List<Intent> intentList = argument.getAllValues();
+        Intent intent = intentList.get(0);
 
         assertThat(TextUtils.equals(TEST_PACKAGE_NAME, intent.getStringExtra(
                 MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
-        assertThat(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT).isEqualTo(intent.getAction());
-        assertThat(TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, intent.getPackage())).isTrue();
+        assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo(
+                intent.getAction());
+        assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME,
+                intent.getPackage())).isTrue();
         assertThat(mToken == intent.getExtras().getParcelable(
                 MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN)).isTrue();
     }
 
     @Test
-    public void getMediaOutputSliceIntent_withoutActiveLocalMedia_verifyIntentExtra() {
+    public void onNotifyChange_withoutActiveLocalMedia_verifyIntentExtra() {
         doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
                 .getActiveLocalMediaController();
-        final Intent intent = mMediaOutputIndicatorSlice.getMediaOutputSliceIntent();
+        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+
+        mMediaOutputIndicatorSlice.onNotifyChange(null);
+        verify(mContext, times(2)).sendBroadcast(argument.capture());
+        List<Intent> intentList = argument.getAllValues();
+        Intent intent = intentList.get(0);
 
         assertThat(TextUtils.isEmpty(intent.getStringExtra(
                 MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
-        assertThat(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT).isEqualTo(intent.getAction());
-        assertThat(TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, intent.getPackage())).isTrue();
+        assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo(
+                intent.getAction());
+        assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME,
+                intent.getPackage())).isTrue();
         assertThat(intent.getExtras().getParcelable(
                 MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN) == null).isTrue();
     }
diff --git a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
index 017faa5..e0e6e50 100644
--- a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
@@ -32,6 +32,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.net.Uri;
 
@@ -87,6 +88,7 @@
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
 
         mRemoteMediaSlice = new RemoteMediaSlice(mContext);
+        mRemoteMediaSlice.mRouterManager = mock(MediaRouter2Manager.class);
         sMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext,
                 REMOTE_MEDIA_SLICE_URI));
         sMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index a7e59fc..5fd417d 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -22,6 +22,7 @@
 import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.mock;
@@ -145,13 +146,13 @@
             mPreference.mEditText.setText(invalid);
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
-            assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue();
+            assertWithMessage("off: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
-            assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue();
+            assertWithMessage("opportunistic: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
-            assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
+            assertWithMessage("provider: " + invalid).that(mSaveButton.isEnabled()).isFalse();
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/network/ApnEditorTest.java
rename to tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
index 7ec1174..0a430cd 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network;
+package com.android.settings.network.apn;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -46,7 +46,8 @@
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
-import com.android.settings.network.ApnEditor.ApnData;
+import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.apn.ApnEditor.ApnData;
 import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
@@ -93,7 +94,7 @@
     private static final int CURSOR_INTEGER_INDEX = 0;
     private static final int CURSOR_STRING_INDEX = 1;
 
-    private static final Uri mApnUri = Uri.parse("Apn://row/1");
+    private static final Uri APN_URI = Uri.parse("Apn://row/1");
 
     @Mock
     private Cursor mCursor;
@@ -382,7 +383,7 @@
     public void testApnData_invalidIntegerType_throwsInvalidTypeException() {
         // GIVEN a ApnData constructed from cursor
         initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
+        final ApnData data = new ApnData(APN_URI, mCursor);
 
         // WHEN get a string from an integer column
         // THEN the InvalidTypeException is threw
@@ -393,7 +394,7 @@
     public void testApnData_invalidStringType_throwsInvalidTypeException() {
         // GIVEN a ApnData constructed from cursor
         initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
+        final ApnData data = new ApnData(APN_URI, mCursor);
 
         // WHEN get a integer from a string column
         // THEN the InvalidTypeException is threw
@@ -404,7 +405,7 @@
     public void testApnData_validIntegerType_returnCorrectValue() {
         // GIVEN a ApnData constructed from cursor
         initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
+        final ApnData data = new ApnData(APN_URI, mCursor);
 
         // WHEN get integer from an integer column
         final int val = data.getInteger(CURSOR_INTEGER_INDEX);
@@ -417,7 +418,7 @@
     public void testApnData_validStringType_returnCorrectValue() {
         // GIVEN a ApnData constructed from cursor
         initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
+        final ApnData data = new ApnData(APN_URI, mCursor);
 
         // WHEN get string from a string column
         final String str = data.getString(CURSOR_STRING_INDEX);
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 e03da10..566ea8b 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -34,7 +34,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
index 401a92e..502e3fe 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
@@ -39,6 +39,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -117,6 +118,7 @@
     }
 
     @Test
+    @Ignore
     public void onPreferenceClick_startsIntent() {
         mController.init(SUB_ID, mFragment, REQUEST_CODE);
         mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
index a612657..c28c28c 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
@@ -115,9 +115,11 @@
     @Test
     public void setChecked_setDataIntoSubscriptionManager() {
         mController.setChecked(true);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(true);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
 
         mController.setChecked(false);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(false);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 525f3ef..6740cb0 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -113,7 +113,7 @@
         final List<String> niks =
                 PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY);
+        assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
index 6dae2a6..8b46374 100644
--- a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
@@ -31,6 +31,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageStats;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.media.session.MediaSessionManager;
 
@@ -100,6 +101,7 @@
                 Context.MEDIA_SESSION_SERVICE);
         mController = new RemoteVolumeGroupController(mContext, KEY_REMOTE_VOLUME_GROUP);
         mController.mLocalMediaManager = mLocalMediaManager;
+        mController.mRouterManager = mock(MediaRouter2Manager.class);
         mPreferenceCategory = spy(new PreferenceCategory(mContext));
         mPreferenceCategory.setKey(mController.getPreferenceKey());
 
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index b6f06f4..af0567f 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -70,7 +70,7 @@
         keys.add("ring_volume");
         keys.add("notification_volume");
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 4adc01b..5067de6 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -22,6 +22,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -84,24 +85,24 @@
     public void isScreenLockVisible_shouldRespectResourceConfig() {
         for (ScreenLockType lock : ScreenLockType.values()) {
             // All locks except managed defaults to visible
-            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+            assertWithMessage(lock + " visible").that(mController.isScreenLockVisible(lock))
                     .isEqualTo(lock != ScreenLockType.MANAGED);
         }
 
         SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
         SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
     }
 
     @Test
     public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
         mController = new ChooseLockGenericController(application, 1 /* userId */);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
     }
 
@@ -109,34 +110,31 @@
     public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
 
-        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
-                .isTrue();
+        assertWithMessage("MANAGED visible").that(
+                mController.isScreenLockVisible(ScreenLockType.MANAGED)).isTrue();
     }
 
     @Test
     public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
-                    .named(lock + " enabled")
-                    .isFalse();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality + 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.defaultQuality)).isTrue();
         }
     }
 
     @Test
     public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality - 1)).isTrue();
         }
     }
 
@@ -144,9 +142,8 @@
     public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
-                    .named(lock + " disabledByAdmin")
-                    .isTrue();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)).isTrue();
         }
     }
 
@@ -154,9 +151,8 @@
     public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)).isFalse();
         }
     }
 
@@ -164,18 +160,16 @@
     public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
         doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        assertThat(mController.isScreenLockDisabledByAdmin(
+        assertWithMessage("MANANGED disabledByAdmin").that(mController.isScreenLockDisabledByAdmin(
                 ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .named("MANANGED disabledByAdmin")
                 .isTrue();
     }
 
@@ -218,7 +212,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
@@ -230,7 +224,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index a9bb8ce..09e4408 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -33,6 +33,7 @@
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -92,18 +93,16 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
-                .named("EXTRA_KEY_FORCE_VERIFY")
+        assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(
+                intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
                 .isFalse();
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
+        assertWithMessage("EXTRA_KEY_PASSWORD").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
                 .isEqualTo(LockscreenCredential.createPassword("password"));
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -115,15 +114,13 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
-                false))
-                .named("EXTRA_KEY_REQUEST_GK_PW")
+        assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(
+                intent.getBooleanExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
                 .isTrue();
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -151,12 +148,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(
+                intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index f95fda4..1cb946b 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -58,16 +59,13 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
+        assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(intent
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
-                .named("EXTRA_KEY_FORCE_VERIFY")
                 .isFalse();
-        assertThat((LockscreenCredential) intent
+        assertWithMessage("EXTRA_KEY_PASSWORD").that((LockscreenCredential) intent
                 .getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
                 .isEqualTo(createPattern("1234"));
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -78,13 +76,11 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
+        assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(intent
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
-                .named("EXTRA_KEY_REQUEST_GK_PW")
                 .isTrue();
-        assertThat(intent
-                .getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID")
+                .that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -94,12 +90,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(intent
+                .getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 1a76799..5242e11 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -115,7 +116,7 @@
         activity.findViewById(R.id.screen_lock_options).performClick();
         AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
         int count = latestAlertDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Test
@@ -141,7 +142,7 @@
         assertThat(nextStartedActivity).isNotNull();
         assertThat(nextStartedActivity.getBooleanExtra(
                 ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
-        assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra")
+        assertWithMessage("Foo extra").that(nextStartedActivity.getStringExtra("foo"))
                 .isEqualTo("bar");
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index 4852546..53e68d9 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -112,7 +113,7 @@
         AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
         assertThat(chooserDialog).isNotNull();
         int count = chooserDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Config(qualifiers = "sw400dp")
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index c9bff38..1fc0230 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -117,7 +117,7 @@
         }
 
         assertThat(keys).hasSize(3);
-        assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5");
+        assertThat(keys).containsAtLeast("pref_key_1", "pref_key_3", "pref_key_5");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
index 2adad00..43d8d94 100644
--- a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
+++ b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
@@ -80,7 +80,7 @@
         final List<String> nonIndexableKeys =
                 SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(nonIndexableKeys).containsAllIn(mTestKeys);
+        assertThat(nonIndexableKeys).containsAtLeastElementsIn(mTestKeys);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index 8b5c5fe..294d05e 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -74,7 +74,7 @@
         List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
                 mTestFragment.getPreferenceScreenResId());
 
-        assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
+        assertThat(keys).containsAtLeast(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
     }
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 8dc0db5..392d44e 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -48,7 +48,7 @@
         final TrustAgentManager m1 = mImpl.getTrustAgentManager();
         final TrustAgentManager m2 = mImpl.getTrustAgentManager();
 
-        assertThat(m1).isSameAs(m2);
+        assertThat(m1).isSameInstanceAs(m2);
     }
 
     @Test
@@ -56,6 +56,6 @@
         final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext);
         final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext);
 
-        assertThat(l1).isSameAs(l2);
+        assertThat(l1).isSameInstanceAs(l2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index 8225c69..eb84a4f 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -300,9 +300,9 @@
 
         mPreference.setKey(TEST_KEY);
         mController.handlePreferenceTreeClick(mPreference);
-        verify(mContext).startActivity(intentCaptor.capture());
+        verify(mContext).sendBroadcast(intentCaptor.capture());
         assertThat(intentCaptor.getValue().getAction())
-                .isEqualTo(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT);
+                .isEqualTo(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 7bdc368..baa4690 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -73,7 +73,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
index da2d590..e118a89 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -18,20 +18,19 @@
 
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Implements(FingerprintManager.class)
 public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager {
 
-    private static List<FingerprintSensorProperties> sFingerprintSensorProperties;
+    private static List<FingerprintSensorPropertiesInternal> sFingerprintSensorProperties;
 
-    public static void setSensorProperties(List<FingerprintSensorProperties> props) {
+    public static void setSensorProperties(List<FingerprintSensorPropertiesInternal> props) {
         sFingerprintSensorProperties = props;
     }
 
@@ -41,7 +40,7 @@
     }
 
     @Implementation
-    protected List<FingerprintSensorProperties> getSensorProperties() {
+    protected List<FingerprintSensorPropertiesInternal> getSensorPropertiesInternal() {
         return sFingerprintSensorProperties;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
deleted file mode 100644
index db9872f..0000000
--- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
+++ /dev/null
@@ -1,282 +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.users;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-
-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.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@RunWith(RobolectricTestRunner.class)
-public class EditUserInfoControllerTest {
-    private static final int MAX_USER_NAME_LENGTH = 100;
-
-    @Mock
-    private Fragment mFragment;
-    @Mock
-    private Drawable mCurrentIcon;
-
-    private boolean mCanChangePhoto;
-
-    private FragmentActivity mActivity;
-    private TestEditUserInfoController mController;
-
-    public class TestEditUserInfoController extends EditUserInfoController {
-        private EditUserPhotoController mPhotoController;
-
-        private EditUserPhotoController getPhotoController() {
-            return mPhotoController;
-        }
-
-        @Override
-        protected EditUserPhotoController createEditUserPhotoController(Fragment fragment,
-                ImageView userPhotoView, Drawable drawable) {
-            mPhotoController = mock(EditUserPhotoController.class, Answers.RETURNS_DEEP_STUBS);
-            return mPhotoController;
-        }
-
-        @Override
-        boolean canChangePhoto(Context context, UserInfo user) {
-            return mCanChangePhoto;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = spy(ActivityController.of(new FragmentActivity()).get());
-        when(mFragment.getActivity()).thenReturn(mActivity);
-        mController = new TestEditUserInfoController();
-        mCanChangePhoto = true;
-    }
-
-    @Test
-    public void photoControllerOnActivityResult_whenWaiting_isCalled() {
-        mController.createDialog(mFragment, mCurrentIcon, "test user",
-                "title", null,
-                android.os.Process.myUserHandle(), null);
-        mController.startingActivityForResult();
-        Intent resultData = new Intent();
-        mController.onActivityResult(0, 0, resultData);
-        EditUserPhotoController photoController = mController.getPhotoController();
-        assertThat(photoController).isNotNull();
-        verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
-    }
-
-    @Test
-    @Config(shadows = ShadowAlertDialogCompat.class)
-    public void userNameView_inputLongName_shouldBeConstrained() {
-        // generate a string of 200 'A's
-        final String longName = Stream.generate(
-                () -> String.valueOf('A')).limit(200).collect(Collectors.joining());
-        final AlertDialog dialog = (AlertDialog) mController.createDialog(mFragment, mCurrentIcon,
-                "test user", "title", null,
-                android.os.Process.myUserHandle(), null);
-        final EditText userName = ShadowAlertDialogCompat.shadowOf(dialog).getView()
-                .findViewById(R.id.user_name);
-
-        userName.setText(longName);
-
-        assertThat(userName.getText().length()).isEqualTo(MAX_USER_NAME_LENGTH);
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenCancelled() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        dialog.show();
-        dialog.cancel();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(0)).onPositive();
-        verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenPositiveClicked() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // No change to the photo.
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenNegativeClicked() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(0)).onPositive();
-        verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onContentChangedCallback_isCalled_whenLabelChanges() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // No change to the photo.
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
-        dialog.show();
-        String expectedNewName = "new test user";
-        EditText editText = (EditText) dialog.findViewById(R.id.user_name);
-        editText.setText(expectedNewName);
-
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(1))
-                .onLabelChanged(any(), eq(expectedNewName));
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onContentChangedCallback_isCalled_whenPhotoChanges() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // A different drawable.
-        Drawable newPhoto = mock(Drawable.class);
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(1))
-                .onPhotoChanged(any(), eq(newPhoto));
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void createDialog_canNotChangePhoto_nullPhotoController() {
-        mCanChangePhoto = false;
-
-        mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", null,
-                android.os.Process.myUserHandle(),
-                null);
-
-        assertThat(mController.mPhotoController).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 27c90b0..ec2fdc6 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -398,7 +398,7 @@
         ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
         verify(mFragment.mUserListCategory).addPreference(captor.capture());
         UserPreference adminPref = captor.getValue();
-        assertThat(adminPref).isSameAs(mMePreference);
+        assertThat(adminPref).isSameInstanceAs(mMePreference);
     }
 
     @Test
@@ -417,7 +417,7 @@
         assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST);
         assertThat(guestPref.isEnabled()).isEqualTo(true);
         assertThat(guestPref.isSelectable()).isEqualTo(true);
-        assertThat(guestPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(guestPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -436,7 +436,7 @@
         assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID);
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -456,7 +456,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -493,7 +493,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -518,7 +518,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up");
         assertThat(userPref.isEnabled()).isEqualTo(false);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index f7702be..5a17622 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -36,6 +36,6 @@
         final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
         mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
 
-        assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader());
+        assertThat(mContextThemeWrapper.getClassLoader()).isSameInstanceAs(clazz.getClassLoader());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index df9a2c1..f73d0f7 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -105,7 +105,7 @@
         mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
         View view = mController.done(mActivity);
 
-        assertThat(view).isSameAs(inputView);
+        assertThat(view).isSameInstanceAs(inputView);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index 9521e7a..89df035 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -36,6 +36,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
         assertThat(keys).isNotNull();
-        assertThat(niks).containsAllIn(keys);
+        assertThat(niks).containsAtLeastElementsIn(keys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 1f4254e..c5f2a7f 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -815,6 +815,22 @@
     }
 
     @Test
+    public void macAddressPref_shouldVisibleAsRandomizedForConnectedNetwork() {
+        setUpForConnectedNetwork();
+        setUpSpyController();
+        when(mMockWifiEntry.isSaved()).thenReturn(true);
+        when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_RANDOMIZED_MAC);
+        when(mMockWifiEntry.getMacAddress()).thenReturn(RANDOMIZED_MAC_ADDRESS);
+
+        displayAndResume();
+
+        verify(mMockMacAddressPref).setVisible(true);
+        verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
+        verify(mMockMacAddressPref).setTitle(
+                R.string.wifi_advanced_randomized_mac_address_title);
+    }
+
+    @Test
     public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() {
         setUpForDisconnectedNetwork();
         when(mMockWifiEntry.isSaved()).thenReturn(true);
@@ -825,7 +841,8 @@
 
         verify(mMockMacAddressPref).setVisible(true);
         verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
-        verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
+        verify(mMockMacAddressPref).setTitle(
+                R.string.wifi_advanced_randomized_mac_address_disconnected_title);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
index 81615f2..c9d2119 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
@@ -103,7 +103,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
deleted file mode 100644
index fbbc01a..0000000
--- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_DEFAULT;
-import static android.app.AppOpsManager.MODE_ERRORED;
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-
-/**
- * An abstract parent for testing settings activities that manage an AppOps permission.
- */
-abstract public class AppOpsSettingsTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-    private static final long START_ACTIVITY_TIMEOUT = 5000;
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-    private PackageManager mPackageManager;
-    private AppOpsManager mAppOpsManager;
-    private List<UserInfo> mProfiles;
-    private String mPackageName;
-
-    // These depend on which app op's settings UI is being tested.
-    private final String mActivityAction;
-    private final int mAppOpCode;
-
-    protected AppOpsSettingsTest(String activityAction, int appOpCode) {
-        mActivityAction = activityAction;
-        mAppOpCode = appOpCode;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPackageName = InstrumentationRegistry.getContext().getPackageName();
-        mPackageManager = mContext.getPackageManager();
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-        mProfiles = mContext.getSystemService(UserManager.class).getProfiles(UserHandle.myUserId());
-        resetAppOpModeForAllProfiles();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    private void resetAppOpModeForAllProfiles() throws Exception {
-        for (UserInfo user : mProfiles) {
-            final int uid = mPackageManager.getPackageUidAsUser(mPackageName, user.id);
-            mAppOpsManager.setMode(mAppOpCode, uid, mPackageName, MODE_DEFAULT);
-        }
-    }
-
-    /**
-     * Creates an intent for showing the permission settings for all apps.
-     */
-    private Intent createManageAllAppsIntent() {
-        final Intent intent = new Intent(mActivityAction);
-        intent.addFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    /**
-     * Creates an intent for showing the permission setting for a single app.
-     */
-    private Intent createManageSingleAppIntent(String packageName) {
-        final Intent intent = createManageAllAppsIntent();
-        intent.setData(Uri.parse("package:" + packageName));
-        return intent;
-    }
-
-    private String getApplicationLabel(String packageName) throws Exception {
-        final ApplicationInfo info = mPackageManager.getApplicationInfo(packageName, 0);
-        return mPackageManager.getApplicationLabel(info).toString();
-    }
-
-    private UiObject2 findAndVerifySwitchState(boolean checked) {
-        final BySelector switchSelector = By.clazz(Switch.class).res("android:id/switch_widget");
-        final UiObject2 switchPref = mUiDevice.wait(Until.findObject(switchSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("Switch not shown", switchPref);
-        assertTrue("Switch in invalid state", switchPref.isChecked() == checked);
-        return switchPref;
-    }
-
-    @Test
-    public void testAppList() throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-
-        mContext.startActivity(createManageAllAppsIntent());
-        final BySelector preferenceListSelector =
-                By.clazz(RecyclerView.class).res("com.android.settings:id/apps_list");
-        final UiObject2 preferenceList = mUiDevice.wait(Until.findObject(preferenceListSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("App list not shown", preferenceList);
-
-        final BySelector appLabelTextViewSelector = By.clazz(TextView.class)
-                .res("android:id/title")
-                .text(testAppLabel);
-        List<UiObject2> listOfMatchingTextViews;
-        do {
-            listOfMatchingTextViews = preferenceList.findObjects(appLabelTextViewSelector);
-            // assuming the number of profiles will be sufficiently small so that all the entries
-            // for the same package will fit in one screen at some time during the scroll.
-        } while (listOfMatchingTextViews.size() != mProfiles.size() &&
-                preferenceList.scroll(Direction.DOWN, 0.2f));
-        assertEquals("Test app not listed for each profile", mProfiles.size(),
-                listOfMatchingTextViews.size());
-
-        for (UiObject2 matchingObject : listOfMatchingTextViews) {
-            matchingObject.click();
-            findAndVerifySwitchState(true);
-            mUiDevice.pressBack();
-        }
-    }
-
-    private void testAppDetailScreenForAppOp(int appOpMode, int userId) throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-        final BySelector appDetailTitleSelector = By.clazz(TextView.class)
-                .res("com.android.settings:id/app_detail_title")
-                .text(testAppLabel);
-
-        mAppOpsManager.setMode(mAppOpCode,
-                mPackageManager.getPackageUidAsUser(mPackageName, userId), mPackageName, appOpMode);
-        mContext.startActivityAsUser(createManageSingleAppIntent(mPackageName),
-                UserHandle.of(userId));
-        mUiDevice.wait(Until.findObject(appDetailTitleSelector), START_ACTIVITY_TIMEOUT);
-        findAndVerifySwitchState(appOpMode == MODE_ALLOWED || appOpMode == MODE_DEFAULT);
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testSingleApp() throws Exception {
-        // App op MODE_DEFAULT is already tested in #testAppList
-        for (UserInfo user : mProfiles) {
-            testAppDetailScreenForAppOp(MODE_ALLOWED, user.id);
-            testAppDetailScreenForAppOp(MODE_ERRORED, user.id);
-        }
-    }
-
-    private void testSwitchToggle(int fromAppOp, int toAppOp) throws Exception {
-        final int packageUid = mPackageManager.getPackageUid(mPackageName, 0);
-        final boolean initialState = (fromAppOp == MODE_ALLOWED || fromAppOp == MODE_DEFAULT);
-
-        mAppOpsManager.setMode(mAppOpCode, packageUid, mPackageName, fromAppOp);
-        mContext.startActivity(createManageSingleAppIntent(mPackageName));
-        final UiObject2 switchPref = findAndVerifySwitchState(initialState);
-        switchPref.click();
-        Thread.sleep(1000);
-        assertEquals("Toggling switch did not change app op", toAppOp,
-                mAppOpsManager.checkOpNoThrow(mAppOpCode, packageUid,
-                        mPackageName));
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testIfSwitchTogglesAppOp() throws Exception {
-        testSwitchToggle(MODE_ALLOWED, MODE_ERRORED);
-        testSwitchToggle(MODE_ERRORED, MODE_ALLOWED);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mUiDevice.pressHome();
-        resetAppOpModeForAllProfiles();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java b/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java
deleted file mode 100644
index b6d51ff..0000000
--- a/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.AppOpsManager;
-import android.provider.Settings;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class DrawOverlaySettingsTest extends AppOpsSettingsTest {
-
-    public DrawOverlaySettingsTest() {
-        super(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, AppOpsManager.OP_SYSTEM_ALERT_WINDOW);
-    }
-
-    // Test cases are in the superclass.
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java b/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
deleted file mode 100644
index b35d6cb..0000000
--- a/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.app.AppOpsManager;
-import android.provider.Settings;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ExternalSourcesSettingsTest extends AppOpsSettingsTest {
-
-    public ExternalSourcesSettingsTest() {
-        super(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
-                AppOpsManager.OP_REQUEST_INSTALL_PACKAGES);
-    }
-
-    // Test cases are in the superclass.
-}
diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
deleted file mode 100644
index 589680d..0000000
--- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.biometrics.fingerprint;
-
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.intent.Intents.intended;
-import static androidx.test.espresso.intent.Intents.intending;
-import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.Instrumentation.ActivityResult;
-import android.content.ComponentName;
-
-import androidx.test.espresso.intent.rule.IntentsTestRule;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class FingerprintEnrollFinishTest {
-
-    @Rule
-    public IntentsTestRule<FingerprintEnrollFinish> mActivityRule =
-            new IntentsTestRule<>(FingerprintEnrollFinish.class);
-
-    @Test
-    public void clickAddAnother_shouldLaunchEnrolling() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_CANCELED, null));
-
-        PartnerCustomizationLayout layout =
-                mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout);
-        layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick();
-
-        intended(hasComponent(enrollingComponent));
-        assertFalse(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickAddAnother_shouldPropagateResults() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_OK, null));
-
-        PartnerCustomizationLayout layout =
-                mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout);
-        layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick();
-
-        intended(hasComponent(enrollingComponent));
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickNext_shouldFinish() {
-        onView(withId(R.id.next_button)).perform(click());
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
deleted file mode 100644
index 454de3d..0000000
--- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.biometrics.fingerprint;
-
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.test.ActivityUnitTestCase;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FingerprintEnrollIntroductionTest
-        extends ActivityUnitTestCase<FingerprintEnrollIntroduction> {
-
-    private TestContext mContext;
-
-    @Mock
-    private FingerprintManager mFingerprintManager;
-
-    private FingerprintEnrollIntroduction mActivity;
-
-    public FingerprintEnrollIntroductionTest() {
-        super(FingerprintEnrollIntroduction.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-        mContext = new TestContext(getInstrumentation().getTargetContext());
-        setActivityContext(mContext);
-
-        getInstrumentation().runOnMainSync(() -> {
-            final Intent intent = new Intent();
-            mActivity = startActivity(intent,
-                    null /* savedInstanceState */, null /* lastNonConfigurationInstance */);
-        });
-    }
-
-    public void testMaxFingerprint_shouldShowErrorMessage() {
-        final int max = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
-        doReturn(generateFingerprintList(max)).when(mFingerprintManager)
-                .getEnrolledFingerprints(anyInt());
-
-        getInstrumentation().runOnMainSync(() -> {
-            getInstrumentation().callActivityOnCreate(mActivity, null);
-            getInstrumentation().callActivityOnResume(mActivity);
-        });
-
-        final TextView errorTextView = (TextView) mActivity.findViewById(R.id.error_text);
-        assertNotNull(errorTextView.getText().toString());
-
-        PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
-        final Button nextButton = layout.getMixin(FooterBarMixin.class).getPrimaryButtonView();
-        assertEquals(View.GONE, nextButton.getVisibility());
-    }
-
-    private List<Fingerprint> generateFingerprintList(int num) {
-        ArrayList<Fingerprint> list = new ArrayList<>();
-        for (int i = 0; i < num; i++) {
-            list.add(new Fingerprint("Fingerprint " + i, 0, i, 0));
-        }
-        return list;
-    }
-
-    public class TestContext extends ContextWrapper {
-
-        public TestContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (Context.FINGERPRINT_SERVICE.equals(name)) {
-                return mFingerprintManager;
-            }
-            return super.getSystemService(name);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
deleted file mode 100644
index 2d083f0..0000000
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.os.Looper;
-import android.platform.test.annotations.Presubmit;
-import android.util.ArraySet;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class PreferenceControllerContractTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    @Presubmit
-    public void controllersInSearchShouldImplementPreferenceControllerMixin() {
-        Looper.prepare(); // Required by AutofillLoggingLevelPreferenceController
-        final Set<String> errorClasses = new ArraySet<>();
-
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData bundle : resources.getProviderValues()) {
-
-            final BaseSearchIndexProvider provider =
-                    (BaseSearchIndexProvider) bundle.getSearchIndexProvider();
-            if (provider == null) {
-                continue;
-            }
-
-            final List<AbstractPreferenceController> controllers =
-                    provider.getPreferenceControllers(mContext);
-            if (controllers == null) {
-                continue;
-            }
-            for (AbstractPreferenceController controller : controllers) {
-                if (!(controller instanceof PreferenceControllerMixin)
-                        && !(controller instanceof BasePreferenceController)) {
-                    errorClasses.add(controller.getClass().getName());
-                }
-            }
-        }
-
-        if (!errorClasses.isEmpty()) {
-            final StringBuilder errorMessage = new StringBuilder()
-                    .append("Each preference must implement PreferenceControllerMixin ")
-                    .append("or extend BasePreferenceController, ")
-                    .append("the following classes don't:\n");
-            for (String c : errorClasses) {
-                errorMessage.append(c).append("\n");
-            }
-            fail(errorMessage.toString());
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
deleted file mode 100644
index f879876..0000000
--- a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import static android.content.pm.PackageManager.GET_ACTIVITIES;
-import static android.content.pm.PackageManager.GET_META_DATA;
-import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
-
-import static com.android.settings.SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.fail;
-
-import static org.junit.Assert.assertFalse;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.gateway.SettingsGateway;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SettingsGatewayTest {
-
-    private static final String TAG = "SettingsGatewayTest";
-
-    private Context mContext;
-    private PackageManager mPackageManager;
-    private String mPackageName;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPackageManager = mContext.getPackageManager();
-        mPackageName = mContext.getPackageName();
-    }
-
-    @Test
-    @Presubmit
-    public void allRestrictedActivityMustBeDefinedInManifest() {
-        for (String className : SettingsGateway.SETTINGS_FOR_RESTRICTED) {
-            final Intent intent = new Intent();
-            intent.setComponent(new ComponentName(mPackageName, className));
-            List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent,
-                    MATCH_DISABLED_COMPONENTS);
-            Log.d(TAG, mPackageName + "/" + className + "; resolveInfo size: "
-                    + resolveInfos.size());
-            assertFalse(className + " is not-defined in manifest", resolveInfos.isEmpty());
-        }
-    }
-
-    @Test
-    @Presubmit
-    public void publicFragmentMustAppearInSettingsGateway()
-            throws PackageManager.NameNotFoundException {
-        final List<String> allowlistedFragment = new ArrayList<>();
-        final StringBuilder error = new StringBuilder();
-
-        for (String fragment : SettingsGateway.ENTRY_FRAGMENTS) {
-            allowlistedFragment.add(fragment);
-        }
-        final PackageInfo pi = mPackageManager.getPackageInfo(mPackageName,
-                GET_META_DATA | MATCH_DISABLED_COMPONENTS | GET_ACTIVITIES);
-        final List<ActivityInfo> activities = Arrays.asList(pi.activities);
-
-        for (ActivityInfo activity : activities) {
-            final Bundle metaData = activity.metaData;
-            if (metaData == null || !metaData.containsKey(META_DATA_KEY_FRAGMENT_CLASS)) {
-                continue;
-            }
-            final String fragmentName = metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
-
-            assertThat(fragmentName).isNotNull();
-            if (!allowlistedFragment.contains(fragmentName)) {
-                error.append("SettingsGateway.ENTRY_FRAGMENTS must contain " + fragmentName
-                        + " because this fragment is used in manifest for " + activity.name)
-                        .append("\n");
-            }
-        }
-        final String message = error.toString();
-        if (!TextUtils.isEmpty(message)) {
-            fail(message);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
deleted file mode 100644
index ddd00a2..0000000
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableRaw;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class UniquePreferenceTest {
-
-    private static final String TAG = "UniquePreferenceTest";
-    private static final List<String> IGNORE_PREF_TYPES = Arrays.asList(
-            "com.android.settingslib.widget.FooterPreference");
-
-    private static final List<String> ALLOWLISTED_DUPLICATE_KEYS = Arrays.asList(
-            "owner_info_settings",          // Lock screen message in security - multiple xml files
-                                            // contain this because security page is constructed by
-                                            // combining small xml chunks. Eventually the page
-                                            // should be formed as one single xml and this entry
-                                            // should be removed.
-
-            "dashboard_tile_placeholder",   // This is the placeholder pref for injecting dynamic
-                                            // tiles.
-            // Dup keys from About Phone v2 experiment.
-            "ims_reg_state",
-            "bt_address",
-            "device_model",
-            "firmware_version",
-            "regulatory_info",
-            "manual",
-            "legal_container",
-            "device_feedback",
-            "fcc_equipment_id",
-            "sim_status",
-            "build_number",
-            "phone_number",
-            "imei_info",
-            "wifi_ip_address",
-            "wifi_mac_address",
-            "safety_info",
-            // Dupe keys from data usage v2.
-            "data_usage_screen",
-            "cellular_data_usage",
-            "data_usage_wifi_screen",
-            "status_header",
-            "billing_preference",
-            "data_usage_cellular_screen",
-            "wifi_data_usage",
-            "data_usage_enable"
-    );
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    /**
-     * All preferences should have their unique key. It's especially important for many parts of
-     * Settings to work properly: we assume pref keys are unique in displaying, search ranking,\
-     * search result suppression, and many other areas.
-     * <p/>
-     * So in this test we are checking preferences participating in search.
-     * <p/>
-     * Note: Preference is not limited to just <Preference/> object. Everything in preference xml
-     * should have a key.
-     */
-    @Test
-    @Presubmit
-    public void allPreferencesShouldHaveUniqueKey()
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        final Set<String> uniqueKeys = new HashSet<>();
-        final Set<String> nullKeyClasses = new HashSet<>();
-        final Set<String> duplicatedKeys = new HashSet<>();
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData SearchIndexableData : resources.getProviderValues()) {
-            verifyPreferenceKeys(uniqueKeys, duplicatedKeys, nullKeyClasses, SearchIndexableData);
-        }
-
-        if (!nullKeyClasses.isEmpty()) {
-            final StringBuilder nullKeyErrors = new StringBuilder()
-                    .append("Each preference/SearchIndexableData must have a key, ")
-                    .append("the following classes have null keys:\n");
-            for (String c : nullKeyClasses) {
-                nullKeyErrors.append(c).append("\n");
-            }
-            fail(nullKeyErrors.toString());
-        }
-
-        if (!duplicatedKeys.isEmpty()) {
-            final StringBuilder dupeKeysError = new StringBuilder(
-                    "The following keys are not unique\n");
-            for (String c : duplicatedKeys) {
-                dupeKeysError.append(c).append("\n");
-            }
-            fail(dupeKeysError.toString());
-        }
-    }
-
-    private void verifyPreferenceKeys(Set<String> uniqueKeys, Set<String> duplicatedKeys,
-            Set<String> nullKeyClasses, SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-
-        final String className = searchIndexableData.getTargetClass().getName();
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-        final List<SearchIndexableRaw> rawsToIndex = provider.getRawDataToIndex(mContext, true);
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-        verifyResources(className, resourcesToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
-        verifyRaws(className, rawsToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
-    }
-
-    private void verifyResources(String className, List<SearchIndexableResource> resourcesToIndex,
-            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
-                    sir.xmlResId,
-                    MetadataFlag.FLAG_INCLUDE_PREF_SCREEN
-                            | MetadataFlag.FLAG_NEED_KEY
-                            | MetadataFlag.FLAG_NEED_PREF_TYPE);
-
-            for (Bundle bundle : metadata) {
-                final String type = bundle.getString(PreferenceXmlParserUtils.METADATA_PREF_TYPE);
-                if (IGNORE_PREF_TYPES.contains(type)) {
-                    continue;
-                }
-                final String key = bundle.getString(PreferenceXmlParserUtils.METADATA_KEY);
-                if (TextUtils.isEmpty(key)) {
-                    Log.e(TAG, "Every preference must have an key; found null key"
-                            + " in " + className);
-                    nullKeyClasses.add(className);
-                    continue;
-                }
-                if (uniqueKeys.contains(key) && !ALLOWLISTED_DUPLICATE_KEYS.contains(key)) {
-                    Log.e(TAG, "Every preference key must unique; found "
-                            + " in " + className
-                            + " / " + key);
-                    duplicatedKeys.add(key);
-                }
-                uniqueKeys.add(key);
-            }
-        }
-    }
-
-    private void verifyRaws(String className, List<SearchIndexableRaw> rawsToIndex,
-            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses) {
-        if (rawsToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableRaw, skipping");
-            return;
-        }
-        for (SearchIndexableRaw raw : rawsToIndex) {
-            if (TextUtils.isEmpty(raw.key)) {
-                Log.e(TAG, "Every SearchIndexableRaw must have an key; found null key"
-                        + " in " + className);
-                nullKeyClasses.add(className);
-                continue;
-            }
-            if (uniqueKeys.contains(raw.key) && !ALLOWLISTED_DUPLICATE_KEYS.contains(raw.key)) {
-                Log.e(TAG, "Every SearchIndexableRaw key must unique; found " + raw.key
-                        + " in " + className);
-                duplicatedKeys.add(raw.key);
-            }
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
deleted file mode 100644
index e8e4927..0000000
--- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Xml;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import com.google.android.collect.Sets;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class UserRestrictionTest {
-
-    private static final String TAG = "UserRestrictionTest";
-
-    private Context mContext;
-
-    private static final Set<String> USER_RESTRICTIONS = Sets.newHashSet(
-            UserManager.DISALLOW_CONFIG_DATE_TIME,
-            UserManager.DISALLOW_CONFIG_CREDENTIALS,
-            UserManager.DISALLOW_NETWORK_RESET,
-            UserManager.DISALLOW_FACTORY_RESET,
-            UserManager.DISALLOW_CONFIG_TETHERING,
-            UserManager.DISALLOW_CONFIG_VPN,
-            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
-            UserManager.DISALLOW_AIRPLANE_MODE,
-            UserManager.DISALLOW_CONFIG_BRIGHTNESS,
-            UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT
-    );
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    /**
-     * Verity that userRestriction attributes are entered and parsed successfully.
-     */
-    @Test
-    public void userRestrictionAttributeShouldBeValid()
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData bundle : resources.getProviderValues()) {
-            verifyUserRestriction(bundle);
-        }
-    }
-
-    private void verifyUserRestriction(SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-
-        final String className = searchIndexableData.getTargetClass().getName();
-
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            if (sir.xmlResId <= 0) {
-                Log.d(TAG, className + " doesn't have a valid xml to index.");
-                continue;
-            }
-            final XmlResourceParser parser = mContext.getResources().getXml(sir.xmlResId);
-
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-                // Parse next until start tag is found
-            }
-            final int outerDepth = parser.getDepth();
-
-            do {
-                if (type != XmlPullParser.START_TAG) {
-                    continue;
-                }
-                final String nodeName = parser.getName();
-                if (!nodeName.endsWith("Preference")) {
-                    continue;
-                }
-                final AttributeSet attrs = Xml.asAttributeSet(parser);
-                final String userRestriction = getDataUserRestrictions(mContext, attrs);
-                if (userRestriction != null) {
-                    if(!isValidRestriction(userRestriction)) {
-                        fail("userRestriction in " + className + " not valid.");
-                    }
-                }
-            } while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth));
-        }
-    }
-
-    boolean isValidRestriction(String userRestriction) {
-        return USER_RESTRICTIONS.contains(userRestriction);
-    }
-
-    private String getDataUserRestrictions(Context context, AttributeSet attrs) {
-        return getData(context, attrs,
-                com.android.settingslib.R.styleable.RestrictedPreference,
-                com.android.settingslib.R.styleable.RestrictedPreference_userRestriction);
-    }
-
-    private String getData(Context context, AttributeSet set, int[] attrs, int resId) {
-        final TypedArray ta = context.obtainStyledAttributes(set, attrs);
-        String data = ta.getString(resId);
-        ta.recycle();
-        return data;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java
new file mode 100644
index 0000000..93ca875
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CellDataPreferenceTest {
+
+    @Mock
+    private SubscriptionInfo mSubInfo;
+
+    private Context mContext;
+    private CellDataPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new CellDataPreference(mContext, null) {
+            @Override
+            SubscriptionInfo getActiveSubscriptionInfo(int subId) {
+                return mSubInfo;
+            }
+        };
+
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+    }
+
+    @Test
+    public void updateEnabled_noActiveSub_shouldDisable() {
+        mSubInfo = null;
+
+        mPreference.mOnSubscriptionsChangeListener.onChanged();
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateEnabled_hasActiveSub_shouldEnable() {
+        mPreference.mOnSubscriptionsChangeListener.onChanged();
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java b/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java
deleted file mode 100644
index dbb73c0..0000000
--- a/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java
+++ /dev/null
@@ -1,65 +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.development;
-
-import android.content.Context;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest {
-
-    private Context mTargetContext;
-    private String[] mListValues;
-    private String[] mListEntries;
-    private String mDefaultMaxConnectedAudioDevices;
-
-    @Before
-    public void setUp() throws Exception {
-        mTargetContext = InstrumentationRegistry.getTargetContext();
-        // Get XML values without mock
-        mListValues = mTargetContext.getResources()
-                .getStringArray(R.array.bluetooth_max_connected_audio_devices_values);
-        mListEntries = mTargetContext.getResources()
-                .getStringArray(R.array.bluetooth_max_connected_audio_devices);
-        mDefaultMaxConnectedAudioDevices = String.valueOf(mTargetContext.getResources()
-                .getInteger(
-                        com.android.internal.R.integer
-                                .config_bluetooth_max_connected_audio_devices));
-    }
-
-    @Test
-    public void verifyResource() {
-        // Verify normal list entries and default preference entries have the same size
-        Assert.assertEquals(mListEntries.length, mListValues.length);
-        Assert.assertThat(Arrays.asList(mListValues),
-                CoreMatchers.hasItem(mDefaultMaxConnectedAudioDevices));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
deleted file mode 100644
index 355a7e4..0000000
--- a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
+++ /dev/null
@@ -1,126 +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.fuelgauge.batterytip;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class RestrictAppTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-    private static final String PACKAGE_SETTINGS = "com.android.settings";
-    private static final String PACKAGE_SYSTEM_UI = "com.android.systemui";
-    private static final int ANOMALY_TYPE =
-            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF;
-
-    private BatteryDatabaseManager mBatteryDatabaseManager;
-    private PackageManager mPackageManager;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        final Context context = InstrumentationRegistry.getTargetContext();
-
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-
-        mPackageManager = context.getPackageManager();
-        mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(context);
-        mBatteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp(System.currentTimeMillis() +
-                TimeUnit.DAYS.toMillis(1));
-    }
-
-    @Test
-    public void batterySettings_hasOneAnomaly_showAnomaly() throws
-            PackageManager.NameNotFoundException {
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
-                PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(createBatteryIntent());
-        onView(withText("Restrict 1 app")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void batterySettings_hasTwoAnomalies_showAnomalies() throws
-            PackageManager.NameNotFoundException {
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
-                PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SYSTEM_UI, 0),
-                PACKAGE_SYSTEM_UI, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(createBatteryIntent());
-        onView(withText("Restrict 2 apps")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void insertDuplicateAnomalies_onlyInsertOnce() throws
-            PackageManager.NameNotFoundException {
-        final int uid = mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0);
-        final long now = System.currentTimeMillis();
-
-        // Insert same anomaly twice, it fails at the second time.
-        assertThat(mBatteryDatabaseManager.insertAnomaly(uid, PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, now)).isTrue();
-        assertThat(mBatteryDatabaseManager.insertAnomaly(uid, PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, now)).isFalse();
-
-        // In database, only contains one row
-        List<AppInfo> newAppInfos = mBatteryDatabaseManager.queryAllAnomalies(0,
-                AnomalyDatabaseHelper.State.NEW);
-        assertThat(newAppInfos).containsExactly(new AppInfo.Builder()
-                .setUid(uid)
-                .setPackageName(PACKAGE_SETTINGS)
-                .addAnomalyType(ANOMALY_TYPE)
-                .build());
-    }
-
-    private Intent createBatteryIntent() {
-        final Intent intent = new Intent(BATTERY_INTENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        return intent;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java b/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
deleted file mode 100644
index 190dc3d..0000000
--- a/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.net.Uri;
-import android.provider.Settings;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class MobileDataEnabledListenerTest {
-    private static final int SUB_ID_ONE = 111;
-    private static final int SUB_ID_TWO = 222;
-
-    @Mock
-    private MobileDataEnabledListener.Client mClient;
-
-    private Context mContext;
-    private MobileDataEnabledListener mListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = ApplicationProvider.getApplicationContext();
-        mListener = new MobileDataEnabledListener(mContext, mClient);
-    }
-
-    @Test
-    public void onMobileDataEnabledChange_firesCorrectly() {
-        mListener.start(SUB_ID_ONE);
-        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
-
-        mContext.getContentResolver().notifyChange(uri, null);
-
-        verify(mClient).onMobileDataEnabledChange();
-    }
-
-    @Test
-    public void onMobileDataEnabledChange_doesNotFireAfterStop() {
-        mListener.start(SUB_ID_ONE);
-        mListener.stop();
-        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
-
-        mContext.getContentResolver().notifyChange(uri, null);
-
-        verify(mClient, never()).onMobileDataEnabledChange();
-    }
-
-    @Test
-    public void onMobileDataEnabledChange_changedToDifferentId_firesCorrectly() {
-        mListener.start(SUB_ID_ONE);
-        mListener.stop();
-        mListener.start(SUB_ID_TWO);
-        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_TWO);
-
-        mContext.getContentResolver().notifyChange(uri, null);
-
-        verify(mClient).onMobileDataEnabledChange();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
new file mode 100644
index 0000000..c540512
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static androidx.lifecycle.Lifecycle.Event;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.Looper;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreference;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileNetworkPreferenceControllerTest {
+    private Context mContext;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mScreen;
+
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    private LifecycleRegistry mLifecycleRegistry;
+    private MobileNetworkPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(MobileNetworkPreferenceController.KEY_MOBILE_NETWORK_SETTINGS);
+
+        mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
+        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
+    }
+
+    @Test
+    public void secondaryUser_prefIsNotAvailable() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
+            .thenReturn(true);
+
+        mController = new MobileNetworkPreferenceController(mContext);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void wifiOnly_prefIsNotAvailable() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
+            .thenReturn(false);
+
+        mController = new MobileNetworkPreferenceController(mContext);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void goThroughLifecycle_isAvailable_shouldListenToServiceChange() {
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        mLifecycleRegistry.addObserver(mController);
+        doReturn(true).when(mController).isAvailable();
+
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
+        verify(mController).onStart();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_SERVICE_STATE);
+
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_STOP);
+        verify(mController).onStop();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_NONE);
+    }
+
+    @Test
+    @UiThreadTest
+    public void serviceStateChange_shouldUpdatePrefSummary() {
+        final String testCarrierName = "test";
+
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        mLifecycleRegistry.addObserver(mController);
+        doReturn(true).when(mController).isAvailable();
+
+        mScreen.addPreference(mPreference);
+
+        // Display pref and go through lifecycle to set up listener.
+        mController.displayPreference(mScreen);
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
+        verify(mController).onStart();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_SERVICE_STATE);
+
+        doReturn(testCarrierName).when(mController).getSummary();
+
+        mController.mPhoneStateListener.onServiceStateChanged(null);
+
+        // Carrier name should be set.
+        Assert.assertEquals(mPreference.getSummary(), testCarrierName);
+    }
+
+    @Test
+    public void airplaneModeTurnedOn_shouldDisablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 1);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void airplaneModeTurnedOffAndNoUserRestriction_shouldEnablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 0);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mPreference.setDisabledByAdmin(null);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void airplaneModeTurnedOffAndHasUserRestriction_shouldDisablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 0);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mPreference.setDisabledByAdmin(EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java b/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java
deleted file mode 100644
index af29dcc..0000000
--- a/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static android.net.TetheringConstants.EXTRA_ADD_TETHER_TYPE;
-import static android.net.TetheringConstants.EXTRA_PROVISION_CALLBACK;
-import static android.net.TetheringManager.TETHERING_WIFI;
-
-import static com.android.settings.network.TetherProvisioningActivity.EXTRA_TETHER_SUBID;
-import static com.android.settings.network.TetherProvisioningActivity.EXTRA_TETHER_UI_PROVISIONING_APP_NAME;
-import static com.android.settings.network.TetherProvisioningActivity.PROVISION_REQUEST;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.TetheringManager;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.provider.Settings;
-import android.telephony.SubscriptionManager;
-
-import androidx.lifecycle.Lifecycle;
-import androidx.test.core.app.ActivityScenario;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(AndroidJUnit4.class)
-public class TetherProvisioningActivityTest {
-    private static class WrappedReceiver extends ResultReceiver {
-        private final CompletableFuture<Integer> mFuture = new CompletableFuture<>();
-
-        WrappedReceiver() {
-            super(null /* handler */);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            mFuture.complete(resultCode);
-        }
-
-        public int get() throws Exception {
-            return mFuture.get(10_000L, TimeUnit.MILLISECONDS);
-        }
-    }
-
-    @Test
-    public void testOnCreate_FinishWithNonActiveDataSubId() throws Exception {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(TetherProvisioningActivity.EXTRA_TETHER_SUBID, 10000))) {
-            assertEquals(TetheringManager.TETHER_ERROR_PROVISIONING_FAILED, receiver.get());
-            assertEquals(Lifecycle.State.DESTROYED, scenario.getState());
-        }
-    }
-
-    @Test
-    public void testOnCreate_FinishWithUnavailableProvisioningApp() throws Exception {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        final int subId = SubscriptionManager.getActiveDataSubscriptionId();
-        final String[] emptyProvisioningApp = { "", "" };
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(EXTRA_TETHER_SUBID, subId)
-                        .putExtra(EXTRA_TETHER_UI_PROVISIONING_APP_NAME, emptyProvisioningApp))) {
-            assertEquals(TetheringManager.TETHER_ERROR_PROVISIONING_FAILED, receiver.get());
-            assertEquals(Lifecycle.State.DESTROYED, scenario.getState());
-        }
-    }
-
-    @Test
-    public void testOnCreate_startActivityForResult() {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        final int subId = SubscriptionManager.getActiveDataSubscriptionId();
-        final String[] provisionApp = new String[] {
-                "android.test.entitlement",
-                "android.test.entitlement.InstrumentedEntitlementActivity"
-        };
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(EXTRA_TETHER_SUBID, subId)
-                        .putExtra(EXTRA_TETHER_UI_PROVISIONING_APP_NAME, provisionApp))) {
-            scenario.onActivity(activity -> {
-                assertFalse(activity.isFinishing());
-                activity.onActivityResult(PROVISION_REQUEST, Activity.RESULT_OK, null /* intent */);
-                try {
-                    assertEquals(TetheringManager.TETHER_ERROR_NO_ERROR, receiver.get());
-                } catch (Exception e) {
-                    // ActivityAction#perform() doesn't throw the exception. Just catch the
-                    // exception and call fail() here.
-                    fail("Can not get result after 10s.");
-                }
-                assertTrue(activity.isFinishing());
-            });
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
index 264abd0..1f3031a 100644
--- a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -37,7 +37,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
diff --git a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
index 6036ec7..67f5f1a 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
@@ -111,9 +111,11 @@
     @Test
     public void setChecked_setDataIntoSubscriptionManager() {
         mController.setChecked(true);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(true);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
 
         mController.setChecked(false);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(false);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
     }
 }
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
deleted file mode 100644
index 3256aba..0000000
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.telephony.CellIdentityLte;
-import android.telephony.CellIdentityWcdma;
-import android.telephony.CellInfoLte;
-import android.telephony.CellInfoWcdma;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.test.annotation.UiThreadTest;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Arrays;
-
-@RunWith(AndroidJUnit4.class)
-public class NetworkSelectSettingsTest {
-    private static final int SUB_ID = 2;
-    private static final String CARRIER_NAME1 = "CarrierName1";
-    private static final String CARRIER_NAME2 = "CarrierName2";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private SharedPreferences mSharedPreferences;
-
-    private CellInfoWcdma mCellInfo1 = new CellInfoWcdma();
-    private CellIdentityWcdma mCellId1 = new CellIdentityWcdma();
-    private CellInfoLte mCellInfo2 = new CellInfoLte();
-    private CellIdentityLte mCellId2 = new CellIdentityLte();
-
-    private Context mContext;
-
-    private PreferenceCategory mPreferenceCategory;
-
-    private NetworkSelectSettings mNetworkSelectSettings;
-
-    @Before
-    @UiThreadTest
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
-
-        mCellInfo1.setRegistered(true);
-        mCellInfo1.setCellIdentity(mCellId1);
-        mCellId1.setOperatorAlphaLong(CARRIER_NAME1);
-        mCellInfo2.setRegistered(false);
-        mCellInfo2.setCellIdentity(mCellId2);
-        mCellId2.setOperatorAlphaLong(CARRIER_NAME2);
-
-        doReturn(mSharedPreferences).when(mPreferenceManager).getSharedPreferences();
-        mPreferenceCategory = spy(new PreferenceCategory(mContext));
-        doReturn(mPreferenceManager).when(mPreferenceCategory).getPreferenceManager();
-
-        mNetworkSelectSettings = spy(new NetworkSelectSettings());
-        doReturn(mContext).when(mNetworkSelectSettings).getContext();
-        doReturn(mPreferenceManager).when(mNetworkSelectSettings).getPreferenceManager();
-        doReturn(mContext).when(mPreferenceManager).getContext();
-
-        mNetworkSelectSettings.mTelephonyManager = mTelephonyManager;
-        mNetworkSelectSettings.mPreferenceCategory = mPreferenceCategory;
-        mNetworkSelectSettings.mCellInfoList = Arrays.asList(mCellInfo1, mCellInfo2);
-    }
-
-    @Test
-    public void updateAllPreferenceCategory_correctOrderingPreference() {
-        mNetworkSelectSettings.updateAllPreferenceCategory();
-
-        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
-        final NetworkOperatorPreference preference =
-                (NetworkOperatorPreference) mPreferenceCategory.getPreference(1);
-        assertThat(preference.getOperatorName()).isEqualTo(mCellId2.getOperatorAlphaLong());
-    }
-
-    @Test
-    public void updateForbiddenPlmns_forbiddenPlmnsNull_shouldNotCrash() {
-        when(mTelephonyManager.getForbiddenPlmns()).thenReturn(null);
-
-        // Should not Crash
-        mNetworkSelectSettings.updateForbiddenPlmns();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
new file mode 100644
index 0000000..027a53b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaListPreferenceTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+
+    private CdmaListPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+        mPreference = spy(new CdmaListPreference(mContext, null));
+        mPreference.setSubId(SUB_ID);
+    }
+
+    @Test
+    public void onClick_inEcm_doNothing() {
+        doReturn(true).when(mTelephonyManager).getEmergencyCallbackMode();
+
+        mPreference.onClick();
+
+        verify(mPreferenceManager, never()).showDialog(mPreference);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
new file mode 100644
index 0000000..86488c6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaSubscriptionPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private CdmaSubscriptionPreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+    private int mCdmaMode;
+    private String mSubscriptionsSupported;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = new CdmaSubscriptionPreferenceController(mContext, "mobile_data");
+        mController.init(mPreferenceManager, SUB_ID);
+        mController.mPreference = mPreference;
+        mPreference.setKey(mController.getPreferenceKey());
+
+        mCdmaMode = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_SUBSCRIPTION_MODE,
+            TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM);
+
+        mSubscriptionsSupported = SystemProperties.get("ril.subscription.types");
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_SUBSCRIPTION_MODE, mCdmaMode);
+
+        SystemProperties.set("ril.subscription.types", mSubscriptionsSupported);
+    }
+
+    @Test
+    public void onPreferenceChange_selectNV_returnNVMode() {
+        doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
+
+        mController.onPreferenceChange(mPreference, Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE,
+                TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(
+                        TelephonyManager.CDMA_SUBSCRIPTION_NV);
+    }
+
+    @Test
+    public void updateState_stateRUIM_displayRUIM() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_NV);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+    }
+
+    @Test
+    public void updateState_stateUnknown_doNothing() {
+        mPreference.setValue(Integer.toString(TelephonyManager.CDMA_SUBSCRIPTION_NV));
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN);
+
+        mController.updateState(mPreference);
+
+        // Still NV mode
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+    }
+
+    @Test
+    public void deviceSupportsNvAndRuim() {
+        SystemProperties.set("ril.subscription.types", "NV,RUIM");
+        assertThat(mController.deviceSupportsNvAndRuim()).isTrue();
+
+        SystemProperties.set("ril.subscription.types", "");
+
+        assertThat(mController.deviceSupportsNvAndRuim()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..4f44a29
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaSystemSelectPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private CdmaSystemSelectPreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+    private int mCdmaRoamingMode;
+    private int mSettingsNetworkMode;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = new CdmaSystemSelectPreferenceController(mContext, "mobile_data");
+        mController.init(mPreferenceManager, SUB_ID);
+        mController.mPreference = mPreference;
+        mPreference.setKey(mController.getPreferenceKey());
+
+        mCdmaRoamingMode = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_ROAMING_MODE,
+            TelephonyManager.CDMA_ROAMING_MODE_ANY);
+
+        mSettingsNetworkMode = Settings.Global.getInt(
+            mContext.getContentResolver(),
+            Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+            TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_ROAMING_MODE, mCdmaRoamingMode);
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, mSettingsNetworkMode);
+    }
+
+    @Test
+    public void onPreferenceChange_selectHome_returnHomeMode() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_ANY);
+        doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
+
+        mController.onPreferenceChange(mPreference,
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_ANY)).isEqualTo(
+                TelephonyManager.CDMA_ROAMING_MODE_HOME);
+    }
+
+    @Test
+    public void updateState_stateHome_displayHome() {
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+                mTelephonyManager).getCdmaRoamingMode();
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+    }
+
+    @Test
+    public void updateState_LteGSMWcdma_disabled() {
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+                mTelephonyManager).getCdmaRoamingMode();
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_stateOther_resetToDefault() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_HOME);
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED).when(
+                mTelephonyManager).getCdmaRoamingMode();
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo(
+                TelephonyManager.CDMA_ROAMING_MODE_ANY);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
deleted file mode 100644
index 19b1360..0000000
--- a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.intent.Intents.intended;
-import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.fail;
-
-import android.app.Instrumentation;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.intent.Intents;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class AppNotificationSettingsTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private UiDevice mUiDevice;
-    private Context mTargetContext;
-    private Instrumentation mInstrumentation;
-
-    NotificationManager mNm;
-    private NotificationChannelGroup mGroup1;
-    private NotificationChannel mGroup1Channel1;
-    private NotificationChannel mGroup1Channel2;
-    private NotificationChannelGroup mGroup2;
-    private NotificationChannel mGroup2Channel1;
-    private NotificationChannel mUngroupedChannel;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-
-        mNm  = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        mGroup1 = new NotificationChannelGroup(this.getClass().getName() + "1", "group1");
-        mGroup2 = new NotificationChannelGroup(this.getClass().getName() + "2", "group2");
-        mNm.createNotificationChannelGroup(mGroup1);
-        mNm.createNotificationChannelGroup(mGroup2);
-
-        mGroup1Channel1 = createChannel(mGroup1, this.getClass().getName()+ "c1-1");
-        mGroup1Channel2 = createChannel(mGroup1, this.getClass().getName()+ "c1-2");
-        mGroup2Channel1 = createChannel(mGroup2, this.getClass().getName()+ "c2-1");
-        mUngroupedChannel = createChannel(null, this.getClass().getName()+ "c");
-    }
-
-    @Test
-    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withId(android.R.id.button1),
-                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-                .check(doesNotExist());
-    }
-
-    @Test
-    public void launchNotificationSetting_showGroupsWithMultipleChannels() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-        onView(allOf(withText(mGroup1.getName().toString()))).check(
-                matches(isDisplayed()));
-        onView(allOf(withText(mGroup1Channel1.getName().toString()))).check(
-                matches(isDisplayed()));
-        onView(allOf(withText(mGroup1Channel2.getName().toString()))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void launchNotificationSetting_showUngroupedChannels() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-        onView(allOf(withText(mUngroupedChannel.getName().toString())))
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void launchNotificationSetting_showGroupsWithOneChannel() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withText(mGroup2.getName().toString())))
-                .check(matches(isDisplayed()));
-        onView(allOf(withText(mGroup2Channel1.getName().toString())))
-                .check(matches(isDisplayed()));
-    }
-
-    private NotificationChannel createChannel(NotificationChannelGroup group,
-            String id) {
-        NotificationChannel channel = new NotificationChannel(id, id, IMPORTANCE_DEFAULT);
-        if (group != null) {
-            channel.setGroup(group.getId());
-        }
-        mNm.createNotificationChannel(channel);
-        return channel;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
deleted file mode 100644
index 4120a07..0000000
--- a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.android.settings;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ZenModeSettingsIntegrationTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    @Test
-    public void testZenModeSettingsPreferences() {
-        launchZenSettings();
-        onView(withText("Calls")).check(matches(isDisplayed()));
-        onView(withText("SMS, MMS, and messaging apps")).check(matches(isDisplayed()));
-        onView(withText("Restrict notifications")).check(matches(isDisplayed()));
-        onView(withText("Duration")).check(matches(isDisplayed()));
-        onView(withText("Schedules")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testZenModeBehaviorPreferences() {
-        launchZenBehaviorSettings();
-        onView(withText("Calls")).check(matches(isDisplayed()));
-        onView(withText("SMS, MMS, and messaging apps")).check(matches(isDisplayed()));
-        onView(withText("Restrict notifications")).check(matches(isDisplayed()));
-        onView(withText("Duration")).check(matches(isDisplayed()));
-        onView(withText("Schedules")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testZenModeAutomationPreferences() {
-        launchZenAutomationSettings();
-        onView(withText("Sleeping")).check(matches(isDisplayed()));
-        onView(withText("Event")).check(matches(isDisplayed()));
-        onView(withText("Add more")).check(matches(isDisplayed()));
-    }
-
-    private void launchZenSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-
-    private void launchZenAutomationSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_AUTOMATION_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-
-    private void launchZenBehaviorSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_PRIORITY_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
deleted file mode 100644
index 4b539cc..0000000
--- a/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.AppTask;
-import android.app.KeyguardManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.text.format.DateUtils;
-import android.view.WindowManager;
-
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockscreenCredential;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Tests for {@link ChooseLockGenericTest}
- *
- * m SettingsTests &&
- * adb install \
- * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
- * -w com.android.settings.tests/androidx.test.runner.AndroidJUnitRunner
- */
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ChooseLockGenericTest {
-    private static final long TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
-    private static final Intent PHISHING_ATTACK_INTENT = new Intent()
-            .putExtra("confirm_credentials", false)
-            .putExtra("password_confirmed", true);
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mSettingPackage;
-
-    @Rule
-    public ActivityTestRule<ChooseLockGeneric> mChooseLockGenericActivityRule =
-            new ActivityTestRule<>(
-                    ChooseLockGeneric.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mSettingPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with no extras.
-            mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
-            // THEN ConfirmLockPassword.InternalActivity is shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword_phishingAttack() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
-            mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
-            // THEN ConfirmLockPassword.InternalActivity is still shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testForFingerprint_inflateLayout() {
-        mChooseLockGenericActivityRule.launchActivity(new Intent()
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true));
-
-        assertThat(mChooseLockGenericActivityRule.getActivity().isResumed()).isTrue();
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-    /** Sets a PIN password, 12345, for testing. */
-    private void setPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
-                        LockscreenCredential.createPin("12345"))
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-
-        // Ignore any interstitial options
-        UiObject view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/encrypt_dont_require_password"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        // Set our PIN
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/password_entry"));
-        assertTrue("password_entry", view.waitForExists(TIMEOUT));
-
-        // Enter it twice to confirm
-        enterTestPin(view);
-        enterTestPin(view);
-
-        // Dismiss notifications setting
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/redaction_done_button"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isTrue();
-    }
-
-    /** Clears the previous set PIN password. */
-    private void clearPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-        // Enter current PIN
-        UiObject view = new UiObject(
-                new UiSelector().resourceId(mSettingPackage + ":id/password_entry"));
-        if (!view.waitForExists(TIMEOUT)) {
-            // Odd, maybe there is a crash dialog showing; try dismissing it
-            mDevice.pressBack();
-            mDevice.waitForIdle();
-
-            assertTrue("password_entry", view.waitForExists(TIMEOUT));
-        }
-
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isFalse();
-    }
-
-    private void finishAllAppTasks() {
-        final ActivityManager activityManager =
-                getTargetContext().getSystemService(ActivityManager.class);
-        final List<AppTask> appTasks = activityManager.getAppTasks();
-        for (ActivityManager.AppTask task : appTasks) {
-            task.finishAndRemoveTask();
-        }
-    }
-
-    private void enterTestPin(UiObject view) throws Exception {
-        mDevice.waitForIdle();
-        view.setText("12345");
-        mDevice.pressEnter();
-        mDevice.waitForIdle();
-    }
-
-    private boolean isSecureWindow(Activity activity) {
-        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
-                != 0;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
deleted file mode 100644
index e12390c..0000000
--- a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * 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.password;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.pressKey;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.CoreMatchers.not;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.view.KeyEvent;
-import android.view.View;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.action.ViewActions;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ChooseLockPasswordTest {
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void clearIsNotShown_when_activityLaunchedInitially() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void clearIsNotShown_when_nothingEntered() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void clearIsShown_when_somethingEnteredToConfirm() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
-                .perform(ViewActions.typeText("1"));
-        // clear should be present if text field contains content
-        assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText())
-                .isEqualTo(mContext.getString(R.string.lockpassword_clear_label));
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.VISIBLE);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java
deleted file mode 100644
index 321284f..0000000
--- a/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.password;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.pressKey;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.view.KeyEvent;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ConfirmLockPasswordTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void enterWrongPin_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-
-    @Test
-    public void enterWrongPin_darkTheme_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class)
-                        .putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, true));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java
deleted file mode 100644
index b0ca636..0000000
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java
+++ /dev/null
@@ -1,98 +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.password;
-
-import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-
-/**
- * Tests for {@link SetupChooseLockGenericTest}
- *
- */
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SetupChooseLockGenericTest {
-
-    private UiDevice mDevice;
-    private Context mContext;
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mContext = getInstrumentation().getTargetContext();
-        Settings.Global.putInt(
-            mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
-    }
-
-    @After
-    public void tearDown() {
-        Settings.Global.putInt(
-            mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
-    }
-
-    @Test
-    public void clickSkipFigerprintPreference_deviceNotProvisioned_shouldBeAbleToProceed()
-            throws Throwable {
-        final Intent newPasswordIntent =
-            new Intent(getTargetContext(), SetupChooseLockGeneric.class)
-            .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true)
-            .setAction(ACTION_SET_NEW_PASSWORD)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-        mDevice.findObject(new UiSelector().textContains("Continue without ")).click();
-
-        final Activity activity = getCurrentActivity();
-        assertThat(activity).isInstanceOf(SetupChooseLockGeneric.InternalActivity.class);
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
index cc0253f..037c805 100644
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -27,6 +27,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.hamcrest.CoreMatchers.not;
 
@@ -80,7 +81,7 @@
         assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
         assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipOrClearButton.performClick();
-        assertThat(activity.isFinishing()).named("Is finishing").isTrue();
+        assertWithMessage("Is finishing").that(activity.isFinishing()).isTrue();
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java b/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java
deleted file mode 100644
index 61629e9..0000000
--- a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java
+++ /dev/null
@@ -1,122 +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.slices;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.PreferenceXmlParserUtils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class SliceDataContractTest {
-
-    private static final String TAG = "SliceDataContractTest";
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    @Presubmit
-    public void preferenceWithControllerMustHaveNonEmptyTitle()
-            throws IOException, XmlPullParserException {
-        final Set<String> nullTitleFragments = new HashSet<>();
-
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-
-        for (SearchIndexableData SearchIndexableData : resources.getProviderValues()) {
-            verifyPreferenceTitle(nullTitleFragments, SearchIndexableData);
-        }
-
-        if (!nullTitleFragments.isEmpty()) {
-            final StringBuilder error = new StringBuilder(
-                    "All preferences with a controller must have a non-empty title by default, "
-                            + "found empty title in the following fragments\n");
-            for (String c : nullTitleFragments) {
-                error.append(c).append("\n");
-            }
-            fail(error.toString());
-        }
-    }
-
-    private void verifyPreferenceTitle(Set<String> nullTitleFragments,
-            SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException {
-
-        final String className = searchIndexableData.getTargetClass().getName();
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
-                    sir.xmlResId,
-                    PreferenceXmlParserUtils.MetadataFlag.FLAG_INCLUDE_PREF_SCREEN
-                            | PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_PREF_TITLE
-                            | PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_PREF_CONTROLLER);
-
-            for (Bundle bundle : metadata) {
-                final String controller = bundle.getString(
-                        PreferenceXmlParserUtils.METADATA_CONTROLLER);
-                if (TextUtils.isEmpty(controller)) {
-                    continue;
-                }
-                final String title = bundle.getString(PreferenceXmlParserUtils.METADATA_TITLE);
-                if (TextUtils.isEmpty(title)) {
-                    nullTitleFragments.add(className);
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java b/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
deleted file mode 100644
index 1a5f923..0000000
--- a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class SavedNetworkSettingsTest {
-
-    // Keys used to lookup resources by name (see the resourceId helper method).
-    private static final String STRING = "string";
-    private static final String WIFI_ADD_NETWORK = "wifi_add_network";
-    private static final String WIFI_NETWORK_LABEL = "wifi_ssid";
-
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<Settings.SavedAccessPointsSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(Settings.SavedAccessPointsSettingsActivity.class, true);
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    private void launchSavedNetworksSettings() {
-        Intent intent = new Intent()
-                .setClassName(mContext.getPackageName(),
-                        Settings.SavedAccessPointsSettingsActivity.class.getName())
-                .setPackage(mContext.getPackageName());
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void launchSavedNetworkSettings_shouldHaveAddNetworkField() {
-        launchSavedNetworksSettings();
-        onView(withText(resourceId(STRING, WIFI_ADD_NETWORK))).check(matches(isDisplayed()))
-                .perform(click());
-        onView(withText(resourceId(STRING, WIFI_NETWORK_LABEL))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java
deleted file mode 100644
index e913e2c..0000000
--- a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isSelected;
-import static androidx.test.espresso.matcher.ViewMatchers.withResourceName;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.anything;
-import static org.junit.Assert.assertEquals;
-import static org.junit.matchers.JUnitMatchers.containsString;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.doReturn;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.UiDevice;
-import android.telephony.SubscriptionInfo;
-import android.telephony.ims.ImsMmTelManager;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.ims.ImsManager;
-import com.android.internal.telephony.SubscriptionController;
-import com.android.settings.testutils.MockedServiceManager;
-
-import junit.framework.Assert;
-
-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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiCallingSettingUiTest {
-    private static final String SUBSCRIPTION0_NAME = "SUB0";
-    private static final String SUBSCRIPTION1_NAME = "SUB1";
-    private static final String WFC_MODE_TITLE = "Calling preference";
-    private static final String WFC_MODE_WIFI_ONLY = "Wi-Fi only";
-    private static final String WFC_MODE_WIFI_PREFERRED = "Wi-Fi preferred";
-    private static final String WFC_MODE_CELLULAR_PREFERRED = "Mobile preferred";
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private UiDevice mDevice;
-    @Mock
-    SubscriptionController mSubscriptionController;
-    MockedServiceManager mMockedServiceManager;
-    protected HashMap<Integer, ImsManager> mImsManagerInstances = new HashMap<>();
-    List<SubscriptionInfo> mSils = new ArrayList();
-    @Mock
-    SubscriptionInfo mSubscriptionInfo0;
-    @Mock
-    SubscriptionInfo mSubscriptionInfo1;
-    @Mock
-    ImsManager mImsManager0;
-    @Mock
-    ImsManager mImsManager1;
-    @Mock
-    ImsMmTelManager mImsMmTelManager0;
-    @Mock
-    ImsMmTelManager mImsMmTelManager1;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-
-        mMockedServiceManager = new MockedServiceManager();
-        mMockedServiceManager.replaceService("isub", mSubscriptionController);
-
-        mMockedServiceManager.replaceInstance(
-                ImsManager.class, "sImsManagerInstances", null, mImsManagerInstances);
-        mMockedServiceManager.replaceInstance(
-                SubscriptionController.class, "sInstance", null, mSubscriptionController);
-        doReturn(mSubscriptionController)
-                .when(mSubscriptionController).queryLocalInterface(anyString());
-        mImsManagerInstances.put(0, mImsManager0);
-        mImsManagerInstances.put(1, mImsManager1);
-        doReturn(mSils).when(mSubscriptionController).getActiveSubscriptionInfoList(anyString(),
-                nullable(String.class));
-        doReturn(0).when(mSubscriptionController).getPhoneId(0);
-        doReturn(1).when(mSubscriptionController).getPhoneId(1);
-        doReturn(0).when(mSubscriptionInfo0).getSubscriptionId();
-        doReturn(1).when(mSubscriptionInfo1).getSubscriptionId();
-        doReturn(0).when(mSubscriptionInfo0).getSimSlotIndex();
-        doReturn(1).when(mSubscriptionInfo1).getSimSlotIndex();
-        doReturn(SUBSCRIPTION0_NAME).when(mSubscriptionInfo0).getDisplayName();
-        doReturn(SUBSCRIPTION1_NAME).when(mSubscriptionInfo1).getDisplayName();
-
-        doReturn(true).when(mImsManager0).isWfcEnabledByPlatform();
-        doReturn(true).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(true).when(mImsManager1).isWfcEnabledByPlatform();
-        doReturn(true).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
-
-        mDevice.wakeUp();
-        mDevice.pressMenu();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mMockedServiceManager.restoreAllServices();
-    }
-
-    @Test
-    public void testSingleSimUi() throws InterruptedException {
-        configureSingleSim();
-        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        mInstrumentation.startActivitySync(createActivityIntent());
-
-        checkSingleSimUi();
-
-        try {
-            mDevice.setOrientationLeft();
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-
-        // Re-check after rotation. Fragment should be recreated properly.
-        checkSingleSimUi();
-
-        try {
-            mDevice.setOrientationNatural();
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-
-        // Re-check after rotation. Fragment should be resumed properly.
-        checkSingleSimUi();
-    }
-
-    private void checkSingleSimUi() {
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_WIFI_PREFERRED))));
-        checkSwitchBarStatus(true, true);
-        checkEmptyViewStatus(false);
-    }
-
-    @Test
-    public void testNoValidSub() throws InterruptedException {
-        configureDualSim();
-        doReturn(false).when(mImsManager0).isWfcEnabledByPlatform();
-        doReturn(false).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(false).when(mImsManager1).isWfcEnabledByPlatform();
-        doReturn(false).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
-
-        checkSwitchBarStatus(false, false);
-        checkEmptyViewStatus(false);
-    }
-
-    @Test
-    public void testWfcDisabled() throws InterruptedException {
-        configureSingleSim();
-        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
-
-        checkSwitchBarStatus(true, false);
-        checkEmptyViewStatus(true);
-    }
-
-    @Test
-    public void testDualSimUi() throws InterruptedException {
-        configureDualSim();
-        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(false).when(mImsManager1).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_CELLULAR_PREFERRED))));
-
-        onView(withText(SUBSCRIPTION0_NAME)).check(matches(isSelected()));
-        checkSwitchBarStatus(true, true);
-        checkEmptyViewStatus(false);
-
-        // Switch to SUB1.
-        onView(withText(SUBSCRIPTION1_NAME)).perform(click());
-
-        checkSwitchBarStatus(true, false);
-        checkEmptyViewStatus(true);
-        onView(withText(SUBSCRIPTION1_NAME)).check(matches(isSelected()));
-    }
-
-    private boolean checkExists(ViewInteraction v) {
-        try {
-            v.check(matches(isCompletelyDisplayed()));
-            return true;
-        } catch (NoMatchingViewException e) {
-            return false;
-        }
-    }
-
-    private Intent createActivityIntent() {
-        Intent intent = new Intent(mContext,
-                com.android.settings.Settings.WifiCallingSettingsActivity.class);
-        intent.setPackage("com.android.settings");
-        intent.setAction("android.intent.action.MAIN");
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    private void configureSingleSim() {
-        mSils.clear();
-        mSils.add(mSubscriptionInfo0);
-    }
-
-    private void configureDualSim() {
-        mSils.clear();
-        mSils.add(mSubscriptionInfo0);
-        mSils.add(mSubscriptionInfo1);
-    }
-
-    private void checkSwitchBarStatus(boolean shouldDisplay, boolean statusOn) {
-        if (shouldDisplay) {
-            try {
-                onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
-                        .check(matches(withText(containsString(statusOn ? "On" : "Off"))));
-            } catch (Exception e) {
-                Assert.fail("Exception " + e);
-            }
-        } else {
-            onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
-                    .check(doesNotExist());
-        }
-    }
-
-    private void checkEmptyViewStatus(boolean shouldDisplay) {
-        try {
-            if (!shouldDisplay) {
-                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
-                        .check(doesNotExist());
-            } else {
-                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
-                        .check(matches(anything()));
-            }
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
deleted file mode 100644
index 4c9b3c5..0000000
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.fragment.app.Fragment;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings.WifiSettingsActivity;
-import com.android.settingslib.utils.ThreadUtils;
-import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiPickerTracker;
-
-import com.google.common.collect.Lists;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiSettingsUiTest {
-    private static final String TEST_SSID = "Test Ssid";
-    private static final String TEST_KEY = "Test Key";
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String STRING = "string";
-    private static final String WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE =
-            "wifi_configure_settings_preference_title";
-    private static final String WIFI_SAVED_ACCESS_POINTS_LABEL = "wifi_saved_access_points_label";
-    private static final String WIFI_EMPTY_LIST_WIFI_OFF = "wifi_empty_list_wifi_off";
-    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-
-    @Mock
-    private WifiPickerTracker mWifiTracker;
-    @Mock
-    private WifiPickerTracker.WifiPickerTrackerCallback mWifiListener;
-
-    private Context mContext;
-    private UiDevice mDevice;
-
-    @Rule
-    public ActivityTestRule<WifiSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(WifiSettingsActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-    }
-
-    /**
-     * Helper to get around the problem that directly accessing settings resource id's from
-     * com.android.settings.R via R.(type).(name) (eg R.id.password or
-     * R.string.wifi_configure_settings_preference_title) may not work due to mismatched resource
-     * ids. See b/37714546 and b/63546650.
-     */
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-
-    /** Launch the activity via an Intent with a String extra. */
-    private void launchActivity(String extraName, String extraValue) {
-        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
-        if (extraName != null && extraValue != null) {
-            intent.putExtra(extraName, extraValue);
-        }
-        mActivityRule.launchActivity(intent);
-
-        List<Fragment> fragments =
-                mActivityRule.getActivity().getSupportFragmentManager().getFragments();
-        assertThat(fragments.size()).isEqualTo(1);
-        ((WifiSettings) fragments.get(0)).mWifiPickerTracker = mWifiTracker;
-        mWifiListener = (WifiSettings) fragments.get(0);
-        assertThat(mWifiListener).isNotNull();
-    }
-
-    /** Helper to launch the activity with no extra. */
-    private void launchActivity() {
-        launchActivity(null, null);
-    }
-
-    private void setWifiState(int wifiState) {
-        when(mWifiTracker.getWifiState()).thenReturn(wifiState);
-    }
-
-    @Test
-    public void launchActivityShouldSucceed() {
-        launchActivity();
-    }
-
-    @Test
-    public void shouldShowWifiPreferences() {
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
-
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void savedNetworksExist_shouldShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);
-
-        launchActivity();
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onNumSavedNetworksChanged());
-
-        onView(allOf(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL)),
-                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void onWifiStateChanged_wifiDisabled_seeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-
-        launchActivity();
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onWifiStateChanged());
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void onWifiStateChanged_wifiEnabled_shouldNotSeeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        launchActivity();
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onWifiStateChanged());
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void onConnected_shouldSeeConnectedMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        final WifiEntry wifiEntry = mock(WifiEntry.class);
-        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
-        when(wifiEntry.getSummary(false /* concise */))
-                .thenReturn(resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-        when(wifiEntry.getKey()).thenReturn(TEST_KEY);
-        when(mWifiTracker.getConnectedWifiEntry()).thenReturn(wifiEntry);
-
-        launchActivity();
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
-        mDevice.waitForIdle();
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void changingSecurityStateOnAp_ShouldNotCauseMultipleListItems() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        final WifiEntry openWifiEntry = mock(WifiEntry.class);
-        when(openWifiEntry.getTitle()).thenReturn(TEST_SSID);
-        when(openWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
-
-        final WifiEntry eapWifiEntry = mock(WifiEntry.class);
-        when(eapWifiEntry.getTitle()).thenReturn(TEST_SSID);
-        when(eapWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
-
-        final WifiEntry wepWifiEntry = mock(WifiEntry.class);
-        when(wepWifiEntry.getTitle()).thenReturn(TEST_SSID);
-        when(wepWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
-
-        // Return a different security state each time getWifiEntries is invoked
-        when(mWifiTracker.getWifiEntries())
-                .thenReturn(Lists.newArrayList(openWifiEntry))
-                .thenReturn(Lists.newArrayList(eapWifiEntry))
-                .thenReturn(Lists.newArrayList(wepWifiEntry));
-
-        launchActivity();
-
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
-        mDevice.waitForIdle();
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
-        mDevice.waitForIdle();
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
-        mDevice.waitForIdle();
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java
deleted file mode 100644
index 33491b6..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_ADD_DEVICE;
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-import android.provider.Settings;
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppChooseSavedWifiNetworkFragmentTest {
-    // Valid Wi-Fi DPP QR code
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String STRING = "string";
-    private static final String WIFI_DPP_CHOOSE_DIFFERENT_NETWORK =
-            "wifi_dpp_choose_different_network";
-    private static final String CANCEL = "cancel";
-
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, /* initialTouchMode */true,
-            /* launchActivity */ false);
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    public void clickCancelButton_configuratorQrCodeScannerIntent_shouldPopBackStack() {
-        final Intent intent =
-                new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-        final WifiDppConfiguratorActivity hostActivity = mActivityRule.launchActivity(intent);
-
-        // Go to WifiDppChooseSavedWifiNetworkFragment and click the cancel button
-        final FragmentManager fragmentManager = hostActivity.getSupportFragmentManager();
-        final WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-        hostActivity.runOnUiThread(() ->
-            ((WifiDppConfiguratorActivity)hostActivity).onScanWifiDppSuccess(wifiQrCode)
-        );
-        onView(withText(resourceString(WIFI_DPP_CHOOSE_DIFFERENT_NETWORK))).perform(click());
-        onView(withText(resourceString(CANCEL))).perform(click());
-
-        assertThat(fragmentManager.findFragmentByTag(TAG_FRAGMENT_ADD_DEVICE)).isNotNull();
-        assertThat(fragmentManager.findFragmentByTag(TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK))
-                .isNull();
-    }
-
-    @Test
-    public void clickCancelButton_processWifiDppQrCodeIntent_shouldFinish() {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-        final WifiDppConfiguratorActivity hostActivity = mActivityRule.launchActivity(intent);
-
-        onView(withText(resourceString(CANCEL))).perform(click());
-
-        assertThat(hostActivity.isFinishing()).isEqualTo(true);
-    }
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
deleted file mode 100644
index 7c87e7d..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.google.android.setupdesign.GlifLayout;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppConfiguratorActivityTest {
-    // Valid Wi-Fi DPP QR code & it's parameters
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class);
-
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-    }
-
-    @Test
-    public void launchActivity_qrCodeScanner_shouldNotAutoFinish() {
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        mActivityRule.launchActivity(intent);
-        FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
-        WifiDppQrCodeScannerFragment fragment =
-                (WifiDppQrCodeScannerFragment) fragmentManager.findFragmentByTag(
-                        WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
-
-        assertThat(fragment.getView() instanceof GlifLayout).isTrue();
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void launchActivity_qrCodeGenerator_shouldNotAutoFinish() {
-        Intent intent = new Intent(
-                WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        mActivityRule.launchActivity(intent);
-        FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
-        WifiDppQrCodeGeneratorFragment fragment =
-                (WifiDppQrCodeGeneratorFragment) fragmentManager.findFragmentByTag(
-                        WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
-
-        assertThat(fragment.getView() instanceof GlifLayout).isTrue();
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void launchActivity_chooseSavedWifiNetwork_shouldNotAutoFinish() {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-
-        mActivityRule.launchActivity(intent);
-
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsWifiNetworkConfigRetriever() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppQrCodeScannerFragment
-                .OnScanWifiDppSuccessListener).isTrue();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsOnClickChooseDifferentNetworkCallback() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppAddDeviceFragment
-                .OnClickChooseDifferentNetworkListener).isTrue();
-    }
-
-    @Test
-    public void rotateScreen_shouldGetCorrectWifiDppQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        // setWifiDppQrCode and check if getWifiDppQrCode correctly after rotation
-        mActivityRule.launchActivity(intent);
-        mActivityRule.getActivity().setWifiDppQrCode(wifiQrCode);
-
-        try {
-            mDevice.setOrientationLeft();
-            mDevice.setOrientationNatural();
-            mDevice.setOrientationRight();
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
-        WifiQrCode restoredWifiDppQrCode = mActivityRule.getActivity().getWifiDppQrCode();
-        assertThat(restoredWifiDppQrCode).isNotNull();
-        assertThat(restoredWifiDppQrCode.getQrCode()).isEqualTo(VALID_WIFI_DPP_QR_CODE);
-    }
-
-    @Test
-    public void rotateScreen_shouldGetCorrectWifiNetworkConfig() {
-        final WifiNetworkConfig wifiNetworkConfig = new WifiNetworkConfig("WPA", "WifiSsid",
-                "password", /* hiddenSsid */ false, /* networkId */ 0, /* isHotspot */ true);
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-
-        // setWifiNetworkConfig and check if getWifiNetworkConfig correctly after rotation
-        mActivityRule.launchActivity(intent);
-        mActivityRule.getActivity().setWifiNetworkConfig(wifiNetworkConfig);
-
-        try {
-            mDevice.setOrientationLeft();
-            mDevice.setOrientationNatural();
-            mDevice.setOrientationRight();
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
-        WifiNetworkConfig restoredWifiNetworkConfig =
-                mActivityRule.getActivity().getWifiNetworkConfig();
-
-        assertThat(restoredWifiNetworkConfig).isNotNull();
-        assertThat(restoredWifiNetworkConfig.getSecurity()).isEqualTo("WPA");
-        assertThat(restoredWifiNetworkConfig.getSsid()).isEqualTo("WifiSsid");
-        assertThat(restoredWifiNetworkConfig.getPreSharedKey()).isEqualTo("password");
-        assertThat(restoredWifiNetworkConfig.getHiddenSsid()).isFalse();
-        assertThat(restoredWifiNetworkConfig.getNetworkId()).isEqualTo(0);
-        assertThat(restoredWifiNetworkConfig.isHotspot()).isTrue();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
deleted file mode 100644
index aef4767..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppEnrolleeActivityTest {
-    @Rule
-    public final ActivityTestRule<WifiDppEnrolleeActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppEnrolleeActivity.class);
-
-    @Test
-    public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {
-        WifiDppEnrolleeActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppQrCodeScannerFragment
-                .OnScanWifiDppSuccessListener).isEqualTo(true);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
deleted file mode 100644
index 239f525..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppQrCodeGeneratorFragmentTest {
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        Intent intent =
-                new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void rotateScreen_shouldNotCrash() {
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
deleted file mode 100644
index d633689..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppQrCodeScannerFragmentTest {
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void rotateScreen_shouldNotCrash() {
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-
-    @Test
-    public void onPause_shouldNotDecodeQrCode() {
-        final WifiDppConfiguratorActivity hostActivity =
-                (WifiDppConfiguratorActivity) mActivityRule.getActivity();
-        final FragmentManager fragmentManager = hostActivity.getSupportFragmentManager();
-        final WifiDppQrCodeScannerFragment scannerFragment =
-                (WifiDppQrCodeScannerFragment) fragmentManager
-                .findFragmentByTag(TAG_FRAGMENT_QR_CODE_SCANNER);
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
-        instrumentation.runOnMainSync(() -> {
-            instrumentation.callActivityOnPause(hostActivity);
-
-            assertThat(scannerFragment.isDecodeTaskAlive()).isEqualTo(false);
-        });
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
deleted file mode 100644
index e4d3a7b..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class WifiQrCodeTest {
-    // Valid Wi-Fi DPP QR code & it's parameters
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    private static final String PUBLIC_KEY_OF_VALID_WIFI_DPP_QR_CODE =
-            "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=";
-
-    private static final String INFORMATION_OF_VALID_WIFI_DPP_QR_CODE =
-            "SN=4774LH2b4044";
-
-    // Valid ZXing reader library's Wi-Fi Network config format & it's parameters
-    private static final String VALID_ZXING_WIFI_QR_CODE_WPA =
-            "WIFI:T:WPA;S:mynetwork;P:mypass;H:true;;";
-
-     // Valid ZXing reader library's Wi-Fi Network config format - security type SAE
-    private static final String VALID_ZXING_WIFI_QR_CODE_SAE =
-            "WIFI:T:SAE;S:mynetwork;P:mypass;H:true;;";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - security type nopass and no password
-    private static final String VALID_ZXING_WIFI_QR_CODE_NOPASS_AND_NO_PASSWORD =
-            "WIFI:T:nopass;S:mynetwork;;";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - no security and no password
-    private static final String VALID_ZXING_WIFI_QR_CODE_NO_SECURITY_AND_NO_PASSWORD =
-            "WIFI:T:;S:mynetwork;P:;H:false;;";
-
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA = "WPA";
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_SAE = "SAE";
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_NOPASS = "nopass";
-    private static final String SSID_OF_VALID_ZXING_WIFI_QR_CODE = "mynetwork";
-    private static final String PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE = "mypass";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - escaped characters
-    private static final String VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS =
-            "WIFI:T:WPA;S:mynetwork;P:m\\;y\\:p\\\\a\\,ss;H:true;;";
-
-    private static final String PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS =
-            "m;y:p\\a,ss";
-
-    // Invalid scheme QR code
-    private static final String INVALID_SCHEME_QR_CODE = "BT:T:WPA;S:mynetwork;P:mypass;H:true;;";
-
-    // Invalid Wi-Fi DPP QR code - no public key - case 1
-    private static final String INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_1 =
-            "DPP:I:SN=4774LH2b4044;M:010203040506;K:;;";
-
-    // Invalid Wi-Fi DPP QR code - no public key - case 2
-    private static final String INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_2 =
-            "DPP:I:SN=4774LH2b4044;M:010203040506;;";
-
-    // Invalid ZXing reader library's Wi-Fi Network config format - no password
-    private static final String INVALID_ZXING_WIFI_QR_CODE_NO_PASSWORD =
-            "WIFI:T:WPA;S:mynetwork;P:;;";
-
-    // Invalid ZXing reader library's Wi-Fi Network config format - no SSID
-    private static final String INVALID_ZXING_WIFI_QR_CODE_NO_SSID =
-            "WIFI:T:WPA;P:mypass;;";
-
-    @Test
-    public void parseValidWifiDppQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-
-        assertEquals(WifiQrCode.SCHEME_DPP, wifiQrCode.getScheme());
-        assertEquals(PUBLIC_KEY_OF_VALID_WIFI_DPP_QR_CODE, wifiQrCode.getPublicKey());
-        assertEquals(INFORMATION_OF_VALID_WIFI_DPP_QR_CODE, wifiQrCode.getInformation());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_WPA);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE, config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCodeSae() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_SAE);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_SAE, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE, config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_noPass_and_no_password() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_NOPASS_AND_NO_PASSWORD);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_NOPASS, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertNull(config.getPreSharedKey());
-        assertEquals(false, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_no_security_and_no_password() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_NO_SECURITY_AND_NO_PASSWORD);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals("", config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals("", config.getPreSharedKey());
-        assertEquals(false, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_specialCharacters() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS,
-                config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void testRemoveBackSlash() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-
-        assertEquals("\\", wifiQrCode.removeBackSlash("\\\\"));
-        assertEquals("ab", wifiQrCode.removeBackSlash("a\\b"));
-        assertEquals("a", wifiQrCode.removeBackSlash("\\a"));
-        assertEquals("\\b", wifiQrCode.removeBackSlash("\\\\b"));
-        assertEquals("c\\", wifiQrCode.removeBackSlash("c\\\\"));
-    }
-
-    @Test
-    public void parseEmptyQrCode_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(null);
-            fail("Null QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("");
-            fail("Empty string QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("DPP:;");
-            fail("Empty content WIFI DPP QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("WIFI:;");
-            fail("Empty content ZXing WIFI QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidSchemeQrCode_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_SCHEME_QR_CODE);
-            fail("Invalid scheme");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidWifiDppQrCode_noPublicKey_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_1);
-            fail("No public key case 1");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode(INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_2);
-            fail("No public key case 2");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidZxingWifiQrCode_noPassword_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_ZXING_WIFI_QR_CODE_NO_PASSWORD);
-            fail("No password");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidZxingWifiQrCode_noSsid_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_ZXING_WIFI_QR_CODE_NO_SSID);
-            fail("No SSID");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
deleted file mode 100644
index 9d9cc34..0000000
--- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static android.net.TetheringConstants.EXTRA_ADD_TETHER_TYPE;
-import static android.net.TetheringConstants.EXTRA_PROVISION_CALLBACK;
-import static android.net.TetheringConstants.EXTRA_RUN_PROVISION;
-import static android.net.TetheringManager.TETHERING_BLUETOOTH;
-import static android.net.TetheringManager.TETHERING_INVALID;
-import static android.net.TetheringManager.TETHERING_USB;
-import static android.net.TetheringManager.TETHERING_WIFI;
-import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
-import static android.net.TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_PROVISIONING_RESPONSE;
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_SILENT_PROVISIONING_ACTION;
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_SUBID;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.app.usage.UsageStatsManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.TetheringManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.os.SystemClock;
-import android.test.ServiceTestCase;
-import android.util.Log;
-
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TetherServiceTest extends ServiceTestCase<TetherService> {
-
-    private static final String TAG = "TetherServiceTest";
-    private static final String FAKE_PACKAGE_NAME = "com.some.package.name";
-    private static final String ENTITLEMENT_PACKAGE_NAME = "com.some.entitlement.name";
-    private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction";
-    private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction";
-    private static final int BOGUS_RECEIVER_RESULT = -5;
-    private static final int MS_PER_HOUR = 60 * 60 * 1000;
-    private static final int SHORT_TIMEOUT = 100;
-    private static final int PROVISION_TIMEOUT = 1000;
-
-    private TetherService mService;
-    private MockTetherServiceWrapper mWrapper;
-    int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-    private int mLastTetherRequestType = TETHERING_INVALID;
-    private int mProvisionResponse = BOGUS_RECEIVER_RESULT;
-    private ProvisionReceiver mProvisionReceiver;
-    private Receiver mResultReceiver;
-
-    @Mock private TetheringManager mTetheringManager;
-    @Mock private PackageManager mPackageManager;
-    @Mock private WifiManager mWifiManager;
-    @Mock private SharedPreferences mPrefs;
-    @Mock private Editor mPrefEditor;
-    @Captor private ArgumentCaptor<PendingIntent> mPiCaptor;
-    @Captor private ArgumentCaptor<String> mStoredTypes;
-
-    public TetherServiceTest() {
-        super(TetherService.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-
-        mContext = new TestContextWrapper(getContext());
-        setContext(mContext);
-
-        mResultReceiver = new Receiver(this);
-        mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-        mProvisionResponse = Activity.RESULT_OK;
-        mProvisionReceiver = new ProvisionReceiver();
-        IntentFilter filter = new IntentFilter(TEST_NO_UI_ACTION);
-        filter.addCategory(Intent.CATEGORY_DEFAULT);
-        mContext.registerReceiver(mProvisionReceiver, filter);
-
-        final String CURRENT_TYPES = "currentTethers";
-        when(mPrefs.getString(CURRENT_TYPES, "")).thenReturn("");
-        when(mPrefs.edit()).thenReturn(mPrefEditor);
-        when(mPrefEditor.putString(eq(CURRENT_TYPES), mStoredTypes.capture())).thenReturn(
-                mPrefEditor);
-        mWrapper = new MockTetherServiceWrapper(mContext);
-
-        ResolveInfo systemAppResolveInfo = new ResolveInfo();
-        ActivityInfo systemActivityInfo = new ActivityInfo();
-        systemActivityInfo.packageName = ENTITLEMENT_PACKAGE_NAME;
-        ApplicationInfo systemAppInfo = new ApplicationInfo();
-        systemAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-        systemActivityInfo.applicationInfo = systemAppInfo;
-        systemAppResolveInfo.activityInfo = systemActivityInfo;
-
-        ResolveInfo nonSystemResolveInfo = new ResolveInfo();
-        ActivityInfo nonSystemActivityInfo = new ActivityInfo();
-        nonSystemActivityInfo.packageName = FAKE_PACKAGE_NAME;
-        nonSystemActivityInfo.applicationInfo = new ApplicationInfo();
-        nonSystemResolveInfo.activityInfo = nonSystemActivityInfo;
-
-        List<ResolveInfo> resolvers = new ArrayList();
-        resolvers.add(nonSystemResolveInfo);
-        resolvers.add(systemAppResolveInfo);
-        when(mPackageManager.queryBroadcastReceivers(
-                any(Intent.class), eq(PackageManager.MATCH_ALL))).thenReturn(resolvers);
-        setupService();
-        getService().setTetherServiceWrapper(mWrapper);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mProvisionReceiver);
-        super.tearDown();
-    }
-
-    public void testStartForProvision() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testStartKeepsProvisionAppActive() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-        assertFalse(mWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
-        // Non-system handler of the intent action should stay idle.
-        assertTrue(mWrapper.isAppInactive(FAKE_PACKAGE_NAME));
-    }
-
-    public void testStartMultiple() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        assertTrue(waitForProvisionRequest(TETHERING_BLUETOOTH));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testPersistTypes() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        waitForProvisionRequest(TETHERING_WIFI);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        waitForProvisionRequest(TETHERING_BLUETOOTH);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        shutdownService();
-        assertEquals(TETHERING_WIFI + "," + TETHERING_BLUETOOTH, mStoredTypes.getValue());
-    }
-
-    public void testFailureStopsTethering_Wifi() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISIONING_FAILED));
-
-        verify(mTetheringManager).stopTethering(TETHERING_WIFI);
-    }
-
-    public void testFailureStopsTethering_Usb() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISIONING_FAILED));
-
-        verify(mTetheringManager).stopTethering(TETHERING_USB);
-    }
-
-    public void testIgnoreOutdatedRequest() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
-        intent.putExtra(EXTRA_TETHER_SILENT_PROVISIONING_ACTION, TEST_NO_UI_ACTION);
-        intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
-        intent.putExtra(EXTRA_TETHER_SUBID, 1 /* Tested subId number */);
-        intent.putExtra(EXTRA_TETHER_PROVISIONING_RESPONSE, TEST_RESPONSE_ACTION);
-        startService(intent);
-
-        SystemClock.sleep(PROVISION_TIMEOUT);
-        assertEquals(TETHERING_INVALID, mLastTetherRequestType);
-        assertTrue(mWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
-        assertTrue(mWrapper.isAppInactive(FAKE_PACKAGE_NAME));
-    }
-
-    private void runProvisioningForType(int type) {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
-        intent.putExtra(EXTRA_TETHER_SILENT_PROVISIONING_ACTION, TEST_NO_UI_ACTION);
-        intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
-        intent.putExtra(EXTRA_TETHER_SUBID, INVALID_SUBSCRIPTION_ID);
-        intent.putExtra(EXTRA_TETHER_PROVISIONING_RESPONSE, TEST_RESPONSE_ACTION);
-        startService(intent);
-    }
-
-    private boolean waitForAppInactive(UsageStatsManager usageStatsManager, String packageName) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (usageStatsManager.isAppInactive(packageName)) {
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionRequest(int expectedType) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastTetherRequestType == expectedType) {
-                mLastTetherRequestType = TETHERING_INVALID;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionRequest timeout: expected=%d, actual=%d",
-                        expectedType, mLastTetherRequestType));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionResponse(int expectedValue) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastReceiverResultCode == expectedValue) {
-                mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionResponse timeout: expected=%d, actual=%d",
-                        expectedValue, mLastReceiverResultCode));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private class TestContextWrapper extends ContextWrapper {
-
-        public TestContextWrapper(Context base) {
-            super(base);
-        }
-
-        @Override
-        public SharedPreferences getSharedPreferences(String name, int mode) {
-            // Stub out prefs to control the persisted tether type list.
-            if (name == "tetherPrefs") {
-                return mPrefs;
-            }
-            return super.getSharedPreferences(name, mode);
-        }
-
-        @Override
-        public PackageManager getPackageManager() {
-            return mPackageManager;
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (TETHERING_SERVICE.equals(name)) {
-                return mTetheringManager;
-            } else if (WIFI_SERVICE.equals(name)) {
-                return mWifiManager;
-            }
-
-            return super.getSystemService(name);
-        }
-    }
-
-    private static final class Receiver extends ResultReceiver {
-        final WeakReference<TetherServiceTest> mTest;
-
-        Receiver(TetherServiceTest test) {
-            super(null);
-            mTest = new WeakReference<TetherServiceTest>(test);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            TetherServiceTest test = mTest.get();
-            if (test != null) {
-                test.mLastReceiverResultCode = resultCode;
-            }
-        }
-    };
-
-    /**
-     * Stubs out the provisioning app receiver.
-     */
-    private class ProvisionReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            mLastTetherRequestType = intent.getIntExtra("TETHER_TYPE", TETHERING_INVALID);
-            sendResponse(mProvisionResponse, context);
-        }
-
-        private void sendResponse(int response, Context context) {
-            Intent responseIntent = new Intent(TEST_RESPONSE_ACTION);
-            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-            responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
-            context.sendBroadcast(
-                    responseIntent, android.Manifest.permission.TETHER_PRIVILEGED);
-        }
-    }
-
-    private static class MockTetherServiceWrapper
-            extends TetherService.TetherServiceWrapper {
-        private final Set<String> mActivePackages;
-
-        MockTetherServiceWrapper(Context context) {
-            super(context);
-            mActivePackages = new HashSet<>();
-        }
-
-        @Override
-        void setAppInactive(String packageName, boolean isInactive) {
-            if (!isInactive) {
-                mActivePackages.add(packageName);
-            } else {
-                mActivePackages.remove(packageName);
-            }
-        }
-
-        boolean isAppInactive(String packageName) {
-            return !mActivePackages.contains(packageName);
-        }
-
-        @Override
-        int getActiveDataSubscriptionId() {
-            return INVALID_SUBSCRIPTION_ID;
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
deleted file mode 100644
index 2de6611..0000000
--- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.tether;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class WifiTetherSettingsTest {
-
-    private static final long TIMEOUT = 2000L;
-
-    private Instrumentation mInstrumentation;
-    private Intent mTetherActivityIntent;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-        mTetherActivityIntent = new Intent()
-                .setClassName(mInstrumentation.getTargetContext().getPackageName(),
-                        Settings.TetherSettingsActivity.class.getName())
-                .setPackage(mInstrumentation.getTargetContext().getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    }
-
-    @After
-    public void tearDown() {
-        mDevice.pressHome();
-    }
-
-    @Test
-    public void launchTetherSettings_shouldHaveAllFields() {
-        launchWifiTetherActivity();
-        onView(withText("Hotspot name")).check(matches(isDisplayed()));
-        onView(withText("Hotspot password")).check(matches(isDisplayed()));
-    }
-
-    private void launchWifiTetherActivity() {
-        mInstrumentation.startActivitySync(mTetherActivityIntent);
-        onView(withText("Wi‑Fi hotspot")).perform();
-        UiObject2 item = mDevice.wait(Until.findObject(By.text("Wi‑Fi hotspot")), TIMEOUT);
-        item.click();
-    }
-}